diff options
| author | Aleksander Wabik <awabik@opera.com> | 2016-03-17 19:24:32 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-03-17 19:24:32 +0000 |
| commit | d8e681bb6317e1c26ca522e15836d13a6d9b14cb (patch) | |
| tree | 705474ef46d0c30a3db239cd13b1f2b33fb1cac5 | |
| parent | a9cf8476ea09b73f3fef44cce66eedeedbf89e16 (diff) | |
| download | gstreamer-plugins-bad-d8e681bb6317e1c26ca522e15836d13a6d9b14cb.tar.gz | |
h264parse, h265parse: fix handling of downstream force-key-unit events
The parser handles the downstream force-key-unit event incorrectly,
it tries to parse it as an upstream force-key-unit event, does not
check the return value, and then uses uninitialized memory in
"all_headers" boolean variable.
https://bugzilla.gnome.org/show_bug.cgi?id=763793
| -rw-r--r-- | gst/videoparsers/gsth264parse.c | 7 | ||||
| -rw-r--r-- | gst/videoparsers/gsth265parse.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c index 8907eb41d..28e8f318f 100644 --- a/gst/videoparsers/gsth264parse.c +++ b/gst/videoparsers/gsth264parse.c @@ -2140,8 +2140,11 @@ check_pending_key_unit_event (GstEvent * pending_event, stream_time = gst_segment_to_stream_time (segment, GST_FORMAT_TIME, timestamp); - gst_video_event_parse_upstream_force_key_unit (pending_event, - NULL, &all_headers, &count); + if (!gst_video_event_parse_upstream_force_key_unit (pending_event, + NULL, &all_headers, &count)) { + gst_video_event_parse_downstream_force_key_unit (pending_event, NULL, + NULL, NULL, &all_headers, &count); + } event = gst_video_event_new_downstream_force_key_unit (timestamp, stream_time, diff --git a/gst/videoparsers/gsth265parse.c b/gst/videoparsers/gsth265parse.c index 5a1984d84..5a8f291ee 100644 --- a/gst/videoparsers/gsth265parse.c +++ b/gst/videoparsers/gsth265parse.c @@ -1714,8 +1714,11 @@ check_pending_key_unit_event (GstEvent * pending_event, GstSegment * segment, stream_time = gst_segment_to_stream_time (segment, GST_FORMAT_TIME, timestamp); - gst_video_event_parse_upstream_force_key_unit (pending_event, - NULL, &all_headers, &count); + if (!gst_video_event_parse_upstream_force_key_unit (pending_event, + NULL, &all_headers, &count)) { + gst_video_event_parse_downstream_force_key_unit (pending_event, NULL, + NULL, NULL, &all_headers, &count); + } event = gst_video_event_new_downstream_force_key_unit (timestamp, stream_time, |