FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mpegts: fix invalid memory access in language descriptor

Browse Source 
Also add a couple sanity asserts/returns

https://bugzilla.gnome.org/show_bug.cgi?id=781024
This commit is contained in:
Vincent Penquerc'h 2017-04-07 10:43:51 +01:00 committed by Sebastian Dröge
parent a3a12d0978
commit 9eab67a4af
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gst-libs/gst/mpegts/gstmpegtsdescriptor.c
View File

@ -855,6 +855,7 @@ gst_mpegts_descriptor_from_registration (const gchar * format_identifier,
GstMpegtsDescriptor *descriptor; GstMpegtsDescriptor *descriptor;
g_return_val_if_fail (format_identifier != NULL, NULL); g_return_val_if_fail (format_identifier != NULL, NULL);
g_return_val_if_fail (additional_info_length > 0 || !additional_info, NULL);
descriptor = _new_descriptor (GST_MTS_DESC_REGISTRATION, descriptor = _new_descriptor (GST_MTS_DESC_REGISTRATION,
4 + additional_info_length); 4 + additional_info_length);
@ -1055,7 +1056,7 @@ gst_mpegts_descriptor_from_iso_639_language (const gchar * language)
g_return_val_if_fail (language != NULL, NULL); g_return_val_if_fail (language != NULL, NULL);
descriptor = _new_descriptor (GST_MTS_DESC_ISO_639_LANGUAGE, 4 + 4); /* a language takes 4 bytes */ descriptor = _new_descriptor (GST_MTS_DESC_ISO_639_LANGUAGE, 4); /* a language takes 4 bytes */
memcpy (descriptor->data + 2, language, 3); memcpy (descriptor->data + 2, language, 3);
descriptor->data[2 + 3] = 0; /* set audio type to undefined */ descriptor->data[2 + 3] = 0; /* set audio type to undefined */
@ -1116,6 +1117,8 @@ gst_mpegts_descriptor_from_custom (guint8 tag, const guint8 * data,
{ {
GstMpegtsDescriptor *descriptor; GstMpegtsDescriptor *descriptor;
g_return_val_if_fail (length > 0 || !data, NULL);
descriptor = _new_descriptor (tag, length); descriptor = _new_descriptor (tag, length);
if (data && (length > 0)) if (data && (length > 0))