FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

rtmpsink: check for failed RTMP context alloc

Browse Source 
Avoids an unlikely crash.

Arguably, if allocation fails we have no chance of
recovering but nonetheless, RTMP_Alloc can fail and
librtmp's RTMP_init() (called next) assumes a non-NULL
pointer is passed without checking.

Additionally, unify exit path on error.
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-12-29 14:16:58 -08:00
parent 4b93a7167f
commit 17da1ad409
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/rtmp/gstrtmpsink.c
View File

@ -162,15 +162,17 @@ gst_rtmp_sink_start (GstBaseSink * basesink)
sink->rtmp_uri = g_strdup (sink->uri); sink->rtmp_uri = g_strdup (sink->uri);
sink->rtmp = RTMP_Alloc (); sink->rtmp = RTMP_Alloc ();
if (!sink->rtmp) {
GST_ERROR_OBJECT (sink, "Could not allocate librtmp's RTMP context");
goto error;
}
RTMP_Init (sink->rtmp); RTMP_Init (sink->rtmp);
if (!RTMP_SetupURL (sink->rtmp, sink->rtmp_uri)) { if (!RTMP_SetupURL (sink->rtmp, sink->rtmp_uri)) {
GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL), GST_ELEMENT_ERROR (sink, RESOURCE, OPEN_WRITE, (NULL),
("Failed to setup URL '%s'", sink->uri)); ("Failed to setup URL '%s'", sink->uri));
RTMP_Free (sink->rtmp); goto error;
sink->rtmp = NULL;
g_free (sink->rtmp_uri);
sink->rtmp_uri = NULL;
return FALSE;
} }
GST_DEBUG_OBJECT (sink, "Created RTMP object"); GST_DEBUG_OBJECT (sink, "Created RTMP object");
@ -182,6 +184,15 @@ gst_rtmp_sink_start (GstBaseSink * basesink)
sink->have_write_error = FALSE; sink->have_write_error = FALSE;
return TRUE; return TRUE;
error:
if (sink->rtmp) {
RTMP_Free (sink->rtmp);
sink->rtmp = NULL;
}
g_free (sink->rtmp_uri);
sink->rtmp_uri = NULL;
return FALSE;
} }
static gboolean static gboolean