mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

aiffparse: Fix an off-by-8 bug in parsing the AIFF data size.

Browse source 
This led to overreading by 8 bytes, giving an audible glitch at the end of
a file (except when the file didn't have a trailing chunk of some sort).
This commit is contained in:
Michael Smith 2009-09-11 14:38:46 -07:00
parent 92ec711733
commit 4066a87156
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/aiffparse/aiffparse.c
View file

@ -834,6 +834,7 @@ gst_aiffparse_stream_headers (AIFFParse * aiff)
GstFormat fmt; GstFormat fmt;
GstBuffer *ssndbuf = NULL; GstBuffer *ssndbuf = NULL;
const guint8 *ssnddata = NULL; const guint8 *ssnddata = NULL;
guint32 datasize;
GST_DEBUG_OBJECT (aiff, "Got 'SSND' TAG, size : %d", size); GST_DEBUG_OBJECT (aiff, "Got 'SSND' TAG, size : %d", size);
@ -859,23 +860,26 @@ gst_aiffparse_stream_headers (AIFFParse * aiff)
} else { } else {
gst_buffer_unref (ssndbuf); gst_buffer_unref (ssndbuf);
} }
aiff->offset += 16; /* 8 byte chunk header, 16 byte SSND header */
aiff->offset += 24;
datasize = size - 16;
aiff->datastart = aiff->offset + aiff->ssnd_offset; aiff->datastart = aiff->offset + aiff->ssnd_offset;
/* file might be truncated */ /* file might be truncated */
fmt = GST_FORMAT_BYTES; fmt = GST_FORMAT_BYTES;
if (upstream_size) { if (upstream_size) {
size = MIN (size, (upstream_size - aiff->datastart)); size = MIN (datasize, (upstream_size - aiff->datastart));
} }
aiff->datasize = (guint64) size; aiff->datasize = (guint64) datasize;
aiff->dataleft = (guint64) size; aiff->dataleft = (guint64) datasize;
aiff->end_offset = size + aiff->datastart; aiff->end_offset = datasize + aiff->datastart;
if (!aiff->streaming) { if (!aiff->streaming) {
/* We will continue looking at chunks until the end - to read tags, /* We will continue looking at chunks until the end - to read tags,
* etc. */ * etc. */
aiff->offset += size; aiff->offset += datasize;
} }
GST_DEBUG_OBJECT (aiff, "datasize = %d", size); GST_DEBUG_OBJECT (aiff, "datasize = %d", datasize);
if (aiff->streaming) { if (aiff->streaming) {
done = TRUE; done = TRUE;
} }