mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: Protect against invalid framerates

Browse source 
This check wasn't done for all mappings.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2295>
This commit is contained in:
Edward Hervey 2022-04-26 09:29:39 +02:00 committed by Edward Hervey
parent b2aaf0f2e5
commit 7b5f867e40
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-base/ext/ogg/gstoggstream.c
View file

@ -425,7 +425,8 @@ setup_theora_mapper (GstOggStream * pad, ogg_packet * packet)
pad->granulerate_n = GST_READ_UINT32_BE (data + 22); pad->granulerate_n = GST_READ_UINT32_BE (data + 22);
pad->granulerate_d = GST_READ_UINT32_BE (data + 26); pad->granulerate_d = GST_READ_UINT32_BE (data + 26);
if (pad->granulerate_n == 0 || pad->granulerate_d == 0) { if (pad->granulerate_n == 0 || pad->granulerate_d == 0) {
GST_WARNING ("frame rate %d/%d", pad->granulerate_n, pad->granulerate_d); GST_WARNING ("Invalid frame rate %d/%d", pad->granulerate_n,
pad->granulerate_d);
pad->granulerate_n = 0; pad->granulerate_n = 0;
pad->granulerate_d = 0; pad->granulerate_d = 0;
return FALSE; return FALSE;
@ -565,6 +566,12 @@ setup_dirac_mapper (GstOggStream * pad, ogg_packet * packet)
return FALSE; return FALSE;
} }
if (header.frame_rate_numerator == 0 || header.frame_rate_denominator == 0) {
GST_WARNING ("invalid framerate %d/%d", header.frame_rate_numerator,
header.frame_rate_denominator);
return FALSE;
}
pad->is_video = TRUE; pad->is_video = TRUE;
pad->always_flush_page = TRUE; pad->always_flush_page = TRUE;
pad->granulerate_n = header.frame_rate_numerator * 2; pad->granulerate_n = header.frame_rate_numerator * 2;
@ -670,6 +677,11 @@ setup_vp8_mapper (GstOggStream * pad, ogg_packet * packet)
fps_n = GST_READ_UINT32_BE (packet->packet + 18); fps_n = GST_READ_UINT32_BE (packet->packet + 18);
fps_d = GST_READ_UINT32_BE (packet->packet + 22); fps_d = GST_READ_UINT32_BE (packet->packet + 22);
if (fps_n == 0 || fps_d == 0) {
GST_WARNING ("invalid framerate %d/%d", fps_n, fps_d);
return FALSE;
}
pad->is_video = TRUE; pad->is_video = TRUE;
pad->is_vp8 = TRUE; pad->is_vp8 = TRUE;
pad->granulerate_n = fps_n; pad->granulerate_n = fps_n;
@ -1690,7 +1702,7 @@ setup_ogmvideo_mapper (GstOggStream * pad, ogg_packet * packet)
pad->is_video = TRUE; pad->is_video = TRUE;
pad->granulerate_n = 10000000; pad->granulerate_n = 10000000;
time_unit = GST_READ_UINT64_LE (data + 17); time_unit = GST_READ_UINT64_LE (data + 17);
if (time_unit > G_MAXINT || time_unit < G_MININT) { if (time_unit > G_MAXINT || time_unit < G_MININT || time_unit == 0) {
GST_WARNING ("timeunit is out of range"); GST_WARNING ("timeunit is out of range");
} }
pad->granulerate_d = (gint) CLAMP (time_unit, G_MININT, G_MAXINT); pad->granulerate_d = (gint) CLAMP (time_unit, G_MININT, G_MAXINT);