Commit bef534aa authored by Marcus Prebble's avatar Marcus Prebble Committed by Sebastian Dröge

rtsp-server: Change the logic so we don't pop a NULL context

When doing a port scan (e.g. with nmap) the call to GST_RTSP_CHECK()
will sometimes fail. This call is made before any context is pushed
resulting in an attempt to pop a NULL context.

https://bugzilla.gnome.org/show_bug.cgi?id=757949
parent bb04132f
......@@ -1191,9 +1191,11 @@ gst_rtsp_server_io_func (GSocket * socket, GIOCondition condition,
manage_client (server, client);
} else {
GST_WARNING_OBJECT (server, "received unknown event %08x", condition);
goto exit_no_ctx;
}
exit:
gst_rtsp_context_pop_current (&ctx);
exit_no_ctx:
return G_SOURCE_CONTINUE;
......@@ -1204,7 +1206,8 @@ accept_failed:
GST_ERROR_OBJECT (server, "Could not accept client on socket %p: %s",
socket, str);
g_free (str);
goto exit;
/* We haven't pushed the context yet, so just return */
goto exit_no_ctx;
}
connection_refused:
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment