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

h265parse: Don't segfault when SPS hasn't been seen yet.

Browse source 
Fix a recently introduced segfault. Don't de-reference a NULL
SPS pointer when attempting to update source caps before SPS
has been seen in the stream.
This commit is contained in:
Jan Schmidt 2019-07-04 01:12:06 +10:00
parent 9a39ba6a35
commit bd46630b62
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/videoparsers/gsth265parse.c
View file

@ -1767,8 +1767,7 @@ ensure_caps_profile (GstH265Parse * h265parse, GstCaps * caps, GstH265SPS * sps)
static void static void
gst_h265_parse_update_src_caps (GstH265Parse * h265parse, GstCaps * caps) gst_h265_parse_update_src_caps (GstH265Parse * h265parse, GstCaps * caps)
{ {
GstH265VPS *vps; GstH265SPS *sps = NULL;
GstH265SPS *sps;
GstCaps *sink_caps, *src_caps; GstCaps *sink_caps, *src_caps;
gboolean modified = FALSE; gboolean modified = FALSE;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
@ -1795,8 +1794,6 @@ gst_h265_parse_update_src_caps (GstH265Parse * h265parse, GstCaps * caps)
sps = h265parse->nalparser->last_sps; sps = h265parse->nalparser->last_sps;
GST_DEBUG_OBJECT (h265parse, "sps: %p", sps); GST_DEBUG_OBJECT (h265parse, "sps: %p", sps);
vps = sps->vps;
GST_DEBUG_OBJECT (h265parse, "vps: %p", vps);
/* only codec-data for nice-and-clean au aligned packetized hevc format */ /* only codec-data for nice-and-clean au aligned packetized hevc format */
if ((h265parse->format == GST_H265_PARSE_FORMAT_HVC1 if ((h265parse->format == GST_H265_PARSE_FORMAT_HVC1
@ -1826,6 +1823,9 @@ gst_h265_parse_update_src_caps (GstH265Parse * h265parse, GstCaps * caps)
gint crop_width, crop_height; gint crop_width, crop_height;
const gchar *chroma_format = NULL; const gchar *chroma_format = NULL;
guint bit_depth_chroma; guint bit_depth_chroma;
GstH265VPS *vps = sps->vps;
GST_DEBUG_OBJECT (h265parse, "vps: %p", vps);
if (sps->conformance_window_flag) { if (sps->conformance_window_flag) {
crop_width = sps->crop_rect_width; crop_width = sps->crop_rect_width;