From 1c7fae3d5d750ac326e864d23f47756949f16acb Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 28 Apr 2006 13:40:15 +0000 Subject: [PATCH] gdp: Fixes in reading/writing events over GDP (not currently used?) - dereferencing ... Original commit message from CVS: * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packet_from_event), (gst_dp_event_from_packet): Fixes in reading/writing events over GDP (not currently used?) - dereferencing NULL events for unknown/invalid event types, memory leak, and change g_warning to GST_WARNING. --- gst/gdp/dataprotocol.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c index 9598321e4c..4f909b1380 100644 --- a/gst/gdp/dataprotocol.c +++ b/gst/gdp/dataprotocol.c @@ -319,7 +319,7 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, /* first construct payload, since we need the length */ switch (GST_EVENT_TYPE (event)) { case GST_EVENT_UNKNOWN: - g_warning ("Unknown event, ignoring"); + GST_WARNING ("Unknown event, ignoring"); *length = 0; g_free (h); return FALSE; @@ -355,10 +355,12 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, case GST_EVENT_QOS: case GST_EVENT_NAVIGATION: case GST_EVENT_TAG: - g_warning ("Unhandled event type %d, ignoring", GST_EVENT_TYPE (event)); + GST_WARNING ("Unhandled event type %d, ignoring", GST_EVENT_TYPE (event)); + *length = 0; + g_free (h); return FALSE; default: - g_warning ("Unknown event type %d, ignoring", GST_EVENT_TYPE (event)); + GST_WARNING ("Unknown event type %d, ignoring", GST_EVENT_TYPE (event)); *length = 0; g_free (h); return FALSE; @@ -486,7 +488,7 @@ gst_dp_event_from_packet (guint header_length, const guint8 * header, type = GST_DP_HEADER_PAYLOAD_TYPE (header) - GST_DP_PAYLOAD_EVENT_NONE; switch (type) { case GST_EVENT_UNKNOWN: - g_warning ("Unknown event, ignoring"); + GST_WARNING ("Unknown event, ignoring"); return FALSE; case GST_EVENT_EOS: case GST_EVENT_FLUSH_START: @@ -520,10 +522,10 @@ gst_dp_event_from_packet (guint header_length, const guint8 * header, case GST_EVENT_QOS: case GST_EVENT_NAVIGATION: case GST_EVENT_TAG: - g_warning ("Unhandled event type %d, ignoring", GST_EVENT_TYPE (event)); + GST_WARNING ("Unhandled event type %d, ignoring", type); return FALSE; default: - g_warning ("Unknown event type %d, ignoring", GST_EVENT_TYPE (event)); + GST_WARNING ("Unknown event type %d, ignoring", type); return FALSE; }