mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmpsink: fix memory leak from URI verification via RTMP_ParseURL()

Browse source 
In gst_rtmp_sink_uri_set_uri(), a test is performed in order
to be sure uri is correct for librtmp. This test calls
RTMP_ParseURL with 3 AVal pointers as parameters: host,
playpath and app.

AVal is a struct with a char* + int. After RTMP_ParseURL call,
host.av_val and app.av_val both refer a substring of "uri". But
playpath.av_val may be the result of a malloc so it needs to
be freed.

https://bugzilla.gnome.org/show_bug.cgi?id=681459
This commit is contained in:
David Régade 2012-10-12 23:09:06 +01:00 committed by Tim-Philipp Müller
parent 953e94ac78
commit 65add5533a
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/rtmp/gstrtmpsink.c
View file

@ -47,6 +47,8 @@
#include <winsock2.h> #include <winsock2.h>
#endif #endif
#include <stdlib.h>
GST_DEBUG_CATEGORY_STATIC (gst_rtmp_sink_debug); GST_DEBUG_CATEGORY_STATIC (gst_rtmp_sink_debug);
#define GST_CAT_DEFAULT gst_rtmp_sink_debug #define GST_CAT_DEFAULT gst_rtmp_sink_debug
@ -293,6 +295,7 @@ gst_rtmp_sink_uri_set_uri (GstURIHandler * handler, const gchar * uri,
GError ** error) GError ** error)
{ {
GstRTMPSink *sink = GST_RTMP_SINK (handler); GstRTMPSink *sink = GST_RTMP_SINK (handler);
gboolean ret = TRUE;
if (GST_STATE (sink) >= GST_STATE_PAUSED) { if (GST_STATE (sink) >= GST_STATE_PAUSED) {
g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_STATE, g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_STATE,
@ -315,14 +318,19 @@ gst_rtmp_sink_uri_set_uri (GstURIHandler * handler, const gchar * uri,
("Failed to parse URI %s", uri), (NULL)); ("Failed to parse URI %s", uri), (NULL));
g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI, g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI,
"Could not parse RTMP URI"); "Could not parse RTMP URI");
return FALSE; ret = FALSE;
} } else {
sink->uri = g_strdup (uri); sink->uri = g_strdup (uri);
} }
if (playpath.av_val)
free (playpath.av_val);
}
if (ret)
GST_DEBUG_OBJECT (sink, "Changed URI to %s", GST_STR_NULL (uri)); GST_DEBUG_OBJECT (sink, "Changed URI to %s", GST_STR_NULL (uri));
return TRUE; return ret;
} }
static void static void