mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/riff/riff-read.c: Read extradata correctly (fixes #155879).

Browse source 
Original commit message from CVS:
* gst-libs/gst/riff/riff-read.c:
(gst_riff_read_strf_auds_with_data):
Read extradata correctly (fixes #155879).
This commit is contained in:
Ronald S. Bultje 2004-12-16 23:57:26 +00:00
parent 83acacc0f6
commit 6c5841870c
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-12-17 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c:
(gst_riff_read_strf_auds_with_data):
Read extradata correctly (fixes #155879).
2004-12-16 David Schleef <ds@schleef.org> 2004-12-16 David Schleef <ds@schleef.org>
* gst/audioscale/gstaudioscale.c: allow passthru of >2 channel * gst/audioscale/gstaudioscale.c: allow passthru of >2 channel

16
gst-libs/gst/riff/riff-read.c
View file

@ -664,16 +664,18 @@ gst_riff_read_strf_auds_with_data (GstRiffRead * riff,
/* size checking */ /* size checking */
*extradata = NULL; *extradata = NULL;
if (strf->size > GST_BUFFER_SIZE (buf)) { if (GST_BUFFER_SIZE (buf) > sizeof (gst_riff_strf_auds) + 2) {
g_warning ("strf_auds header gave %d bytes data, only %d available",
strf->size, GST_BUFFER_SIZE (buf));
strf->size = GST_BUFFER_SIZE (buf);
} else if (strf->size < GST_BUFFER_SIZE (buf)) {
gint len; gint len;
len = GST_BUFFER_SIZE (buf) - strf->size - 2; len = GST_READ_UINT16_LE (&GST_BUFFER_DATA (buf)[16]);
if (len + 2 + sizeof (gst_riff_strf_auds) > GST_BUFFER_SIZE (buf)) {
GST_WARNING ("Extradata indicated %d bytes, but only %d available",
len, GST_BUFFER_SIZE (buf) - 2 - sizeof (gst_riff_strf_auds));
len = GST_BUFFER_SIZE (buf) - 2 - sizeof (gst_riff_strf_auds);
}
if (len > 0) { if (len > 0) {
*extradata = gst_buffer_create_sub (buf, strf->size + 2, len); *extradata = gst_buffer_create_sub (buf,
sizeof (gst_riff_strf_auds) + 2, len);
} }
} }