mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 15:22:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

Avoid reads on freed memory (patch from vishnu)

Browse source 
Original commit message from CVS:
Avoid reads on freed memory (patch from vishnu)
This commit is contained in:
Wim Taymans 2003-01-12 13:06:44 +00:00
parent 2e1e40935f
commit 1f144436cb
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/gstqueue.c
View file

@ -571,6 +571,8 @@ gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
{ {
GstQueue *queue; GstQueue *queue;
gboolean res; gboolean res;
gint event_type;
gint flag_flush = 0;
queue = GST_QUEUE (GST_OBJECT_PARENT (pad)); queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
@ -586,14 +588,19 @@ gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
return FALSE; return FALSE;
} }
event_type = GST_EVENT_TYPE (event);
if (event_type == GST_EVENT_SEEK)
flag_flush = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH;
res = gst_pad_event_default (pad, event); res = gst_pad_event_default (pad, event);
switch (GST_EVENT_TYPE (event)) {
switch (event_type) {
case GST_EVENT_FLUSH: case GST_EVENT_FLUSH:
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n"); GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n");
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
break; break;
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) { if (flag_flush) {
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
} }
default: default:

11
plugins/elements/gstqueue.c
View file

@ -571,6 +571,8 @@ gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
{ {
GstQueue *queue; GstQueue *queue;
gboolean res; gboolean res;
gint event_type;
gint flag_flush = 0;
queue = GST_QUEUE (GST_OBJECT_PARENT (pad)); queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
@ -586,14 +588,19 @@ gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
return FALSE; return FALSE;
} }
event_type = GST_EVENT_TYPE (event);
if (event_type == GST_EVENT_SEEK)
flag_flush = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH;
res = gst_pad_event_default (pad, event); res = gst_pad_event_default (pad, event);
switch (GST_EVENT_TYPE (event)) {
switch (event_type) {
case GST_EVENT_FLUSH: case GST_EVENT_FLUSH:
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n"); GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n");
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
break; break;
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH) { if (flag_flush) {
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
} }
default: default: