mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 15:48:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegts: Fix descriptor checks

Browse source 
Only use g_return_val_if_fail on provided direct arguments. The others get
checked all the time.

https://bugzilla.gnome.org/show_bug.cgi?id=724464
This commit is contained in:
Edward Hervey 2014-02-24 15:52:53 +01:00
parent ba0a3f65eb
commit 63145f4576
3 changed files with 65 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
gst-libs/gst/mpegts/gst-dvb-descriptor.c
View file

@ -64,10 +64,9 @@ gboolean
gst_mpegts_descriptor_parse_dvb_network_name (const GstMpegTsDescriptor * gst_mpegts_descriptor_parse_dvb_network_name (const GstMpegTsDescriptor *
descriptor, gchar ** name) descriptor, gchar ** name)
{ {
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && name != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x40, FALSE);
/* We need at least one byte of data for the string */ /* We need at least one byte of data for the string */
g_return_val_if_fail (descriptor->length >= 1, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_NETWORK_NAME, 1, FALSE);
*name = get_encoding_and_convert ((gchar *) descriptor->data + 2, *name = get_encoding_and_convert ((gchar *) descriptor->data + 2,
descriptor->data[1]); descriptor->data[1]);
@ -126,11 +125,10 @@ gst_mpegts_descriptor_parse_satellite_delivery_system (const GstMpegTsDescriptor
guint8 *data; guint8 *data;
guint8 tmp; guint8 tmp;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x43, FALSE);
/* This descriptor is always 11 bytes long */ /* This descriptor is always 11 bytes long */
g_return_val_if_fail (descriptor->length == 11, FALSE); __common_desc_checks_exact (descriptor,
GST_MTS_DESC_DVB_SATELLITE_DELIVERY_SYSTEM, 11, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
@ -203,11 +201,10 @@ gst_mpegts_descriptor_parse_cable_delivery_system (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x44, FALSE);
/* This descriptor is always 11 bytes long */ /* This descriptor is always 11 bytes long */
g_return_val_if_fail (descriptor->length == 11, FALSE); __common_desc_checks_exact (descriptor,
GST_MTS_DESC_DVB_CABLE_DELIVERY_SYSTEM, 11, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
/* BCD in MHz, decimal place after the fourth character */ /* BCD in MHz, decimal place after the fourth character */
@ -270,10 +267,9 @@ gst_mpegts_descriptor_parse_dvb_service (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x48, FALSE);
/* Need at least 3 bytes (type and 2 bytes for the string length) */ /* Need at least 3 bytes (type and 2 bytes for the string length) */
g_return_val_if_fail (descriptor->length >= 3, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_SERVICE, 3, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
@ -307,10 +303,9 @@ gst_mpegts_descriptor_parse_dvb_short_event (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x4D, FALSE);
/* Need at least 5 bytes (3 for language code, 2 for each string length) */ /* Need at least 5 bytes (3 for language code, 2 for each string length) */
g_return_val_if_fail (descriptor->length >= 5, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_SHORT_EVENT, 5, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
@ -349,8 +344,8 @@ gst_mpegts_descriptor_parse_dvb_teletext_idx (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_DVB_TELETEXT, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_TELETEXT, 0, FALSE);
if (descriptor->length / 5 <= idx) if (descriptor->length / 5 <= idx)
return FALSE; return FALSE;
@ -386,8 +381,8 @@ guint
gst_mpegts_descriptor_parse_dvb_teletext_nb (const GstMpegTsDescriptor * gst_mpegts_descriptor_parse_dvb_teletext_nb (const GstMpegTsDescriptor *
descriptor) descriptor)
{ {
if (descriptor == NULL || descriptor->data == NULL) g_return_val_if_fail (descriptor != NULL, 0);
return 0; __common_desc_checks (descriptor, GST_MTS_DESC_DVB_TELETEXT, 0, 0);
return descriptor->length / 5; return descriptor->length / 5;
} }
@ -417,9 +412,8 @@ gst_mpegts_descriptor_parse_dvb_subtitling_idx (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && lang != NULL, FALSE);
g_return_val_if_fail (lang != NULL, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_SUBTITLING, 0, FALSE);
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_DVB_SUBTITLING, FALSE);
/* If we went too far, return FALSE */ /* If we went too far, return FALSE */
if (descriptor->length / 8 <= idx) if (descriptor->length / 8 <= idx)
@ -454,7 +448,8 @@ guint
gst_mpegts_descriptor_parse_dvb_subtitling_nb (const GstMpegTsDescriptor * gst_mpegts_descriptor_parse_dvb_subtitling_nb (const GstMpegTsDescriptor *
descriptor) descriptor)
{ {
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, 0); g_return_val_if_fail (descriptor != NULL, FALSE);
__common_desc_checks (descriptor, GST_MTS_DESC_DVB_SUBTITLING, 0, FALSE);
return descriptor->length / 8; return descriptor->length / 8;
} }
@ -510,12 +505,9 @@ gst_mpegts_descriptor_parse_dvb_extended_event (const GstMpegTsDescriptor
guint8 tmp, len_item; guint8 tmp, len_item;
GstMpegTsExtendedEventItem *item; GstMpegTsExtendedEventItem *item;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_DVB_EXTENDED_EVENT,
FALSE);
/* Need at least 6 bytes (1 for desc number, 3 for language code, 2 for the loop length) */ /* Need at least 6 bytes (1 for desc number, 3 for language code, 2 for the loop length) */
g_return_val_if_fail (descriptor->length >= 6, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_EXTENDED_EVENT, 6, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
@ -578,11 +570,9 @@ gst_mpegts_descriptor_parse_dvb_component (const GstMpegTsDescriptor
guint8 *data; guint8 *data;
guint8 len; guint8 len;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_DVB_COMPONENT, FALSE);
/* Need 6 bytes at least (1 for content, 1 for type, 1 for tag, 3 for language code) */ /* Need 6 bytes at least (1 for content, 1 for type, 1 for tag, 3 for language code) */
g_return_val_if_fail (descriptor->length >= 6, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_COMPONENT, 6, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
@ -622,8 +612,8 @@ gst_mpegts_descriptor_parse_dvb_content (const GstMpegTsDescriptor
guint8 *data; guint8 *data;
guint8 len, tmp; guint8 len, tmp;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && content != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_DVB_CONTENT, FALSE); __common_desc_checks (descriptor, GST_MTS_DESC_DVB_CONTENT, 0, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
len = descriptor->length; len = descriptor->length;
@ -647,7 +637,7 @@ gst_mpegts_descriptor_parse_dvb_content (const GstMpegTsDescriptor
/* GST_MTS_DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM (0x5A) */ /* GST_MTS_DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM (0x5A) */
/** /**
* gst_mpegts_descriptor_parse_dvb_terrestrial_delivary_system: * gst_mpegts_descriptor_parse_dvb_terrestrial_delivary_system:
* @descriptor: a %GST_MTS_DESC_DVB_CONTENT #GstMpegTsDescriptor * @descriptor: a %GST_MTS_DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM #GstMpegTsDescriptor
* @res: (out) (transfer none): #GstMpegTsTerrestrialSystemDescriptor * @res: (out) (transfer none): #GstMpegTsTerrestrialSystemDescriptor
* *
* Parses out the terrestrial delivery system from the @descriptor: * Parses out the terrestrial delivery system from the @descriptor:
@ -662,11 +652,10 @@ gst_mpegts_descriptor_parse_terrestrial_delivery_system (const
guint8 *data; guint8 *data;
guint8 tmp; guint8 tmp;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x5a, FALSE);
/* Descriptor is always 11 bytes long */ /* Descriptor is always 11 bytes long */
g_return_val_if_fail (descriptor->length == 11, FALSE); __common_desc_checks_exact (descriptor,
GST_MTS_DESC_DVB_TERRESTRIAL_DELIVERY_SYSTEM, 11, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;

25
gst-libs/gst/mpegts/gstmpegts-private.h
View file

@ -48,6 +48,31 @@ G_GNUC_INTERNAL gpointer __common_section_checks (GstMpegTsSection *section,
GstMpegTsParseFunc parsefunc, GstMpegTsParseFunc parsefunc,
GDestroyNotify destroynotify); GDestroyNotify destroynotify);
#define __common_desc_check_base(desc, tagtype, retval) \
if (G_UNLIKELY ((desc)->data == NULL)) { \
GST_WARNING ("Descriptor is empty (data field == NULL)"); \
return retval; \
} \
if (G_UNLIKELY ((desc)->tag != (tagtype))) { \
GST_WARNING ("Wrong descriptor type (Got 0x%02x, expected 0x%02x)", \
(desc)->tag, tagtype); \
return retval; \
} \
#define __common_desc_checks(desc, tagtype, minlen, retval) \
__common_desc_check_base(desc, tagtype, retval); \
if (G_UNLIKELY ((desc)->length < (minlen))) { \
GST_WARNING ("Descriptor too small (Got %d, expected at least %d)", \
(desc)->length, minlen); \
return retval; \
}
#define __common_desc_checks_exact(desc, tagtype, len, retval) \
__common_desc_check_base(desc, tagtype, retval); \
if (G_UNLIKELY ((desc)->length != (len))) { \
GST_WARNING ("Wrong descriptor size (Got %d, expected %d)", \
(desc)->length, len); \
return retval; \
}
G_END_DECLS G_END_DECLS

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

@ -879,10 +879,9 @@ gst_mpegts_descriptor_parse_iso_639_language (const GstMpegTsDescriptor *
guint i; guint i;
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x0A, FALSE);
/* This descriptor can be empty, no size check needed */ /* This descriptor can be empty, no size check needed */
__common_desc_checks (descriptor, GST_MTS_DESC_ISO_639_LANGUAGE, 0, FALSE);
data = (guint8 *) descriptor->data + 2; data = (guint8 *) descriptor->data + 2;
/* Each language is 3 + 1 bytes */ /* Each language is 3 + 1 bytes */
@ -917,10 +916,9 @@ gst_mpegts_descriptor_parse_iso_639_language_idx (const GstMpegTsDescriptor *
{ {
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && lang != NULL, FALSE);
g_return_val_if_fail (lang != NULL, FALSE); /* This descriptor can be empty, no size check needed */
g_return_val_if_fail (descriptor->tag == GST_MTS_DESC_ISO_639_LANGUAGE, __common_desc_checks (descriptor, GST_MTS_DESC_ISO_639_LANGUAGE, 0, FALSE);
FALSE);
if (descriptor->length / 4 <= idx) if (descriptor->length / 4 <= idx)
return FALSE; return FALSE;
@ -948,7 +946,9 @@ guint
gst_mpegts_descriptor_parse_iso_639_language_nb (const GstMpegTsDescriptor * gst_mpegts_descriptor_parse_iso_639_language_nb (const GstMpegTsDescriptor *
descriptor) descriptor)
{ {
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, 0); g_return_val_if_fail (descriptor != NULL, 0);
/* This descriptor can be empty, no size check needed */
__common_desc_checks (descriptor, GST_MTS_DESC_ISO_639_LANGUAGE, 0, FALSE);
return descriptor->length / 4; return descriptor->length / 4;
} }
@ -969,9 +969,9 @@ gst_mpegts_descriptor_parse_logical_channel (const GstMpegTsDescriptor *
guint i; guint i;
guint8 *data; guint8 *data;
g_return_val_if_fail (descriptor != NULL && descriptor->data != NULL, FALSE); g_return_val_if_fail (descriptor != NULL && res != NULL, FALSE);
g_return_val_if_fail (descriptor->tag == 0x83, FALSE);
/* This descriptor loop can be empty, no size check required */ /* This descriptor loop can be empty, no size check required */
__common_desc_checks (descriptor, GST_MTS_DESC_DTG_LOGICAL_CHANNEL, 0, FALSE);
data = (guint8 *) descriptor->data; data = (guint8 *) descriptor->data;
res->nb_channels = descriptor->length / 4; res->nb_channels = descriptor->length / 4;