mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegts: Fix assertion fault in ISO 639 parsing

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=709180
This commit is contained in:
Jesper Larsen 2013-10-10 22:46:48 +02:00 committed by Edward Hervey
parent f0b5d84c54
commit 0d57756512
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/mpegts/gstmpegtsdescriptor.c
View file

@ -639,7 +639,7 @@ gst_mpegts_descriptor_parse_iso_639_language (const GstMpegTsDescriptor *
* @descriptor: a %GST_MTS_DESC_ISO_639_LANGUAGE #GstMpegTsDescriptor * @descriptor: a %GST_MTS_DESC_ISO_639_LANGUAGE #GstMpegTsDescriptor
* @idx: Table id of the language to parse * @idx: Table id of the language to parse
* @lang (out) (transfer none): 4-byte gchar array to hold the language code * @lang (out) (transfer none): 4-byte gchar array to hold the language code
* @audio_type: (out) (transfer none): the #GstMpegTsIso639AudioType to set * @audio_type: (out) (transfer none) (allow-none): the #GstMpegTsIso639AudioType to set
* *
* Extracts the iso 639-2 language information from specific table id in @descriptor. * Extracts the iso 639-2 language information from specific table id in @descriptor.
* *
@ -659,17 +659,19 @@ gst_mpegts_descriptor_parse_iso_639_language_idx (const GstMpegTsDescriptor *
g_return_val_if_fail (lang != NULL, FALSE); g_return_val_if_fail (lang != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_ISO_639_LANGUAGE, g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_ISO_639_LANGUAGE,
FALSE); FALSE);
g_return_val_if_fail (audio_type != NULL, FALSE);
g_return_val_if_fail (descriptor->length / 4 > idx, FALSE); if (descriptor->length / 4 <= idx)
return FALSE;
data = (guint8 *) descriptor->data + 2 + idx * 4; data = (guint8 *) descriptor->data + 2 + idx * 4;
memcpy (lang, data, 3); memcpy (lang, data, 3);
*lang[3] = 0; (*lang)[3] = 0;
data += 3; data += 3;
*audio_type = *data; if (audio_type)
*audio_type = *data;
return TRUE; return TRUE;
} }