mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 22:42:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-client: Fix leaking of session in error cases

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=755632
This commit is contained in:
Sebastian Dröge 2016-08-02 15:08:22 +03:00
parent 63653a1ebe
commit 687301af86
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/rtsp-server/rtsp-client.c
View file

@ -2066,20 +2066,20 @@ media_not_found_no_reply:
{ {
GST_ERROR ("client %p: media '%s' not found", client, path); GST_ERROR ("client %p: media '%s' not found", client, path);
/* error reply is already sent */ /* error reply is already sent */
goto cleanup_path; goto cleanup_session;
} }
media_not_found: media_not_found:
{ {
GST_ERROR ("client %p: media '%s' not found", client, path); GST_ERROR ("client %p: media '%s' not found", client, path);
send_generic_response (client, GST_RTSP_STS_NOT_FOUND, ctx); send_generic_response (client, GST_RTSP_STS_NOT_FOUND, ctx);
goto cleanup_path; goto cleanup_session;
} }
control_not_found: control_not_found:
{ {
GST_ERROR ("client %p: no control in path '%s'", client, path); GST_ERROR ("client %p: no control in path '%s'", client, path);
send_generic_response (client, GST_RTSP_STS_NOT_FOUND, ctx); send_generic_response (client, GST_RTSP_STS_NOT_FOUND, ctx);
g_object_unref (media); g_object_unref (media);
goto cleanup_path; goto cleanup_session;
} }
stream_not_found: stream_not_found:
{ {
@ -2087,14 +2087,14 @@ stream_not_found:
GST_STR_NULL (control)); GST_STR_NULL (control));
send_generic_response (client, GST_RTSP_STS_NOT_FOUND, ctx); send_generic_response (client, GST_RTSP_STS_NOT_FOUND, ctx);
g_object_unref (media); g_object_unref (media);
goto cleanup_path; goto cleanup_session;
} }
service_unavailable: service_unavailable:
{ {
GST_ERROR ("client %p: can't create session", client); GST_ERROR ("client %p: can't create session", client);
send_generic_response (client, GST_RTSP_STS_SERVICE_UNAVAILABLE, ctx); send_generic_response (client, GST_RTSP_STS_SERVICE_UNAVAILABLE, ctx);
g_object_unref (media); g_object_unref (media);
goto cleanup_path; goto cleanup_session;
} }
sessmedia_unavailable: sessmedia_unavailable:
{ {
@ -2144,7 +2144,8 @@ keymgmt_error:
cleanup_session: cleanup_session:
if (new_session) if (new_session)
gst_rtsp_session_pool_remove (priv->session_pool, session); gst_rtsp_session_pool_remove (priv->session_pool, session);
g_object_unref (session); if (session)
g_object_unref (session);
cleanup_path: cleanup_path:
g_free (path); g_free (path);
return FALSE; return FALSE;