mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gdp: Fixes in reading/writing events over GDP (not currently used?) - dereferencing ...

Browse source 
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.
This commit is contained in:
Michael Smith 2006-04-28 13:40:15 +00:00 committed by Tim-Philipp Müller
parent ed4d76a9f0
commit 039571d013
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/gdp/dataprotocol.c
View file

@ -319,7 +319,7 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags,
/* first construct payload, since we need the length */ /* first construct payload, since we need the length */
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_UNKNOWN: case GST_EVENT_UNKNOWN:
g_warning ("Unknown event, ignoring"); GST_WARNING ("Unknown event, ignoring");
*length = 0; *length = 0;
g_free (h); g_free (h);
return FALSE; return FALSE;
@ -355,10 +355,12 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags,
case GST_EVENT_QOS: case GST_EVENT_QOS:
case GST_EVENT_NAVIGATION: case GST_EVENT_NAVIGATION:
case GST_EVENT_TAG: 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; return FALSE;
default: 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; *length = 0;
g_free (h); g_free (h);
return FALSE; 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; type = GST_DP_HEADER_PAYLOAD_TYPE (header) - GST_DP_PAYLOAD_EVENT_NONE;
switch (type) { switch (type) {
case GST_EVENT_UNKNOWN: case GST_EVENT_UNKNOWN:
g_warning ("Unknown event, ignoring"); GST_WARNING ("Unknown event, ignoring");
return FALSE; return FALSE;
case GST_EVENT_EOS: case GST_EVENT_EOS:
case GST_EVENT_FLUSH_START: 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_QOS:
case GST_EVENT_NAVIGATION: case GST_EVENT_NAVIGATION:
case GST_EVENT_TAG: 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; return FALSE;
default: default:
g_warning ("Unknown event type %d, ignoring", GST_EVENT_TYPE (event)); GST_WARNING ("Unknown event type %d, ignoring", type);
return FALSE; return FALSE;
} }