mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-17 07:52:47 +00:00
Code Issues Projects Releases Wiki Activity

typefind: Handle WavPack block sizes > 131072

Browse source 
These are valid nowadays.

Also handle ID_ODD_SIZE and ID_WVX_NEW_BITSTREAM. The parser already
handles the former but not the latter.

Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3440

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6498>
This commit is contained in:
Sebastian Dröge 2024-04-01 14:31:49 +03:00 committed by GStreamer Marge Bot
parent 0a26a92b2b
commit 2dde87710c
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
subprojects/gst-plugins-base/gst/typefind/gsttypefindfunctions.c
View file

@ -2073,9 +2073,6 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
* work in pull-mode */
blocksize = GST_READ_UINT32_LE (data + 4);
GST_LOG ("wavpack header, blocksize=0x%04x", blocksize);
/* If bigger than maximum allowed blocksize, refuse */
if (blocksize > 131072)
return;
count_wv = 0;
count_wvc = 0;
offset = 32;
@ -2088,32 +2085,43 @@ wavpack_type_find (GstTypeFind * tf, gpointer unused)
if (data == NULL)
break;
sublen = ((guint32) data[1]) << 1;
// ID_LARGE
if (data[0] & 0x80) {
sublen |= (((guint32) data[2]) << 9) | (((guint32) data[3]) << 17);
sublen += 1 + 3; /* id + length */
} else {
sublen += 1 + 1; /* id + length */
}
// ID_ODD_SIZE
if (data[0] & 0x40) {
if (sublen == 0)
return;
sublen -= 1;
}
if (offset + sublen > 8 + blocksize) {
GST_LOG ("chunk length too big (%u > %" G_GUINT64_FORMAT ")", sublen,
blocksize - offset);
break;
}
if ((data[0] & 0x20) == 0) {
switch (data[0] & 0x0f) {
case 0xa: /* ID_WV_BITSTREAM */
case 0xc: /* ID_WVX_BITSTREAM */
++count_wv;
break;
case 0xb: /* ID_WVC_BITSTREAM */
++count_wvc;
break;
default:
break;
}
if (count_wv >= 5 || count_wvc >= 5)
switch (data[0] & 0x3f) {
case 0xa: /* ID_WV_BITSTREAM */
case 0xc: /* ID_WVX_BITSTREAM */
case 0x2c: /* ID_WVX_NEW_BITSTREAM */
++count_wv;
break;
case 0xb: /* ID_WVC_BITSTREAM */
++count_wvc;
break;
default:
break;
}
if (count_wv >= 5 || count_wvc >= 5)
break;
offset += sublen;
}