From 0d40afa9f00df02a56be1e0081824d5916a23887 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 13 Dec 2011 10:44:42 +0100 Subject: [PATCH] Revert "mpegtsparse: check offset when retrieving table_id on malformed packets" This reverts commit e62978d045d57ee9fed7598c02b9017eb974ea36. --- gst/mpegdemux/mpegtsparse.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/gst/mpegdemux/mpegtsparse.c b/gst/mpegdemux/mpegtsparse.c index 14372d3..8a33fc1 100644 --- a/gst/mpegdemux/mpegtsparse.c +++ b/gst/mpegdemux/mpegtsparse.c @@ -1,7 +1,7 @@ /* - * mpegtsparse.c - + * mpegtsparse.c - * Copyright (C) 2007 Alessandro Decina - * + * * Authors: * Alessandro Decina * Zaheer Abbas Merali @@ -222,9 +222,11 @@ mpegts_parse_base_init (gpointer klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_static_pad_template (element_class, &sink_template); + gst_element_class_add_static_pad_template (element_class, + &sink_template); gst_element_class_add_static_pad_template (element_class, &src_template); - gst_element_class_add_static_pad_template (element_class, &program_template); + gst_element_class_add_static_pad_template (element_class, + &program_template); gst_element_class_set_details_simple (element_class, "MPEG transport stream parser", "Codec/Parser", @@ -892,19 +894,6 @@ mpegts_parse_is_psi (MpegTSParse * parse, MpegTSPacketizerPacket * packet) if (packet->payload_unit_start_indicator) { data = packet->data; pointer = *data++; - /* avoid out of range: - * packet->data is equal to GST_BUFFER_DATA (packet->buffer) - * so the data size is GST_BUFFER_SIZE (packet->buffer). - * 'pointer' is the offset (the next line is data += pointer) - * so we need to check that 'pointer' is not greater than the data size - * For example GST_BUFFER_SIZE (packet->buffer) is typically equal to 188 - * So 'pointer' has to be strictly less than 188 - */ - if (!(pointer < GST_BUFFER_SIZE (packet->buffer))) { - GST_WARNING_OBJECT (parse, - "Wrong offset when retrieving table id: 0x%x", pointer); - return FALSE; - } data += pointer; table_id = *data; i = 0; -- 2.7.4