mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some new alignment bugs in the tagstruct handling.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@477 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-02-10 12:05:33 +00:00
parent 8d91ffe4b4
commit 4ab432a819
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
polyp/tagstruct.c
View file

@ -203,6 +203,7 @@ void pa_tagstruct_put_channel_map(pa_tagstruct *t, const pa_channel_map *map) {
void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume) { void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume) {
unsigned i; unsigned i;
pa_volume_t vol;
assert(t); assert(t);
extend(t, 2 + cvolume->channels * sizeof(pa_volume_t)); extend(t, 2 + cvolume->channels * sizeof(pa_volume_t));
@ -211,7 +212,8 @@ void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume) {
t->data[t->length++] = cvolume->channels; t->data[t->length++] = cvolume->channels;
for (i = 0; i < cvolume->channels; i ++) { for (i = 0; i < cvolume->channels; i ++) {
*(pa_volume_t*) (t->data + t->length) = htonl(cvolume->values[i]); vol = htonl(cvolume->values[i]);
memcpy(t->data + t->length, &vol, sizeof(pa_volume_t));
t->length += sizeof(pa_volume_t); t->length += sizeof(pa_volume_t);
} }
} }
@ -433,6 +435,7 @@ int pa_tagstruct_get_channel_map(pa_tagstruct *t, pa_channel_map *map) {
int pa_tagstruct_get_cvolume(pa_tagstruct *t, pa_cvolume *cvolume) { int pa_tagstruct_get_cvolume(pa_tagstruct *t, pa_cvolume *cvolume) {
unsigned i; unsigned i;
pa_volume_t vol;
assert(t); assert(t);
assert(cvolume); assert(cvolume);
@ -449,8 +452,10 @@ int pa_tagstruct_get_cvolume(pa_tagstruct *t, pa_cvolume *cvolume) {
if (t->rindex+2+cvolume->channels*sizeof(pa_volume_t) > t->length) if (t->rindex+2+cvolume->channels*sizeof(pa_volume_t) > t->length)
return -1; return -1;
for (i = 0; i < cvolume->channels; i ++) for (i = 0; i < cvolume->channels; i ++) {
cvolume->values[i] = (pa_volume_t) ntohl(*((pa_volume_t*) (t->data + t->rindex + 2)+i)); memcpy(&vol, t->data + t->rindex + 2 + i * sizeof(pa_volume_t), sizeof(pa_volume_t));
cvolume->values[i] = (pa_volume_t) ntohl(vol);
}
if (!pa_cvolume_valid(cvolume)) if (!pa_cvolume_valid(cvolume))
return -1; return -1;