mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

curlhhtpsrc: avoid invalid memory references

Browse source 
gst_curl_http_src_remove_queue_item() can free qelement and then
we get an invalid memory reference when we do qelement->next a
couple of lines below. Take the next pointer earlier so that we can
safely free.
This commit is contained in:
Wim Taymans 2018-08-16 11:42:25 +02:00
parent e098ad4918
commit cb16d0b239
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/curl/gstcurlhttpsrc.c
View file

@ -1509,7 +1509,7 @@ static void
gst_curl_http_src_curl_multi_loop (gpointer thread_data) gst_curl_http_src_curl_multi_loop (gpointer thread_data)
{ {
GstCurlHttpSrcMultiTaskContext *context; GstCurlHttpSrcMultiTaskContext *context;
GstCurlHttpSrcQueueElement *qelement; GstCurlHttpSrcQueueElement *qelement, *qnext;
int i, still_running; int i, still_running;
gboolean cond = FALSE; gboolean cond = FALSE;
CURLMsg *curl_message; CURLMsg *curl_message;
@ -1655,6 +1655,7 @@ gst_curl_http_src_curl_multi_loop (gpointer thread_data)
} else if (context->state == GSTCURL_MULTI_LOOP_STATE_REQUEST_REMOVAL) { } else if (context->state == GSTCURL_MULTI_LOOP_STATE_REQUEST_REMOVAL) {
qelement = context->queue; qelement = context->queue;
while (qelement != NULL) { while (qelement != NULL) {
qnext = qelement->next;
if (qelement->p == context->request_removal_element) { if (qelement->p == context->request_removal_element) {
g_mutex_lock (&qelement->p->buffer_mutex); g_mutex_lock (&qelement->p->buffer_mutex);
curl_multi_remove_handle (context->multi_handle, curl_multi_remove_handle (context->multi_handle,
@ -1668,7 +1669,7 @@ gst_curl_http_src_curl_multi_loop (gpointer thread_data)
g_mutex_unlock (&qelement->p->buffer_mutex); g_mutex_unlock (&qelement->p->buffer_mutex);
gst_curl_http_src_remove_queue_item (&context->queue, qelement->p); gst_curl_http_src_remove_queue_item (&context->queue, qelement->p);
} }
qelement = qelement->next; qelement = qnext;
} }
context->request_removal_element = NULL; context->request_removal_element = NULL;
context->state = GSTCURL_MULTI_LOOP_STATE_RUNNING; context->state = GSTCURL_MULTI_LOOP_STATE_RUNNING;