Skip to content

V
vlc-1.1
Commit bf04f9a8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix httpd reference counting (closes: #2614)

parent a18ca585
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
src/network/httpd.c
View file @ bf04f9a8
...@@ -1018,7 +1018,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, ...@@ -1018,7 +1018,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
ptrval.p_address = httpd; ptrval.p_address = httpd;
libvlc_priv (p_this->p_libvlc)->p_httpd = httpd; libvlc_priv (p_this->p_libvlc)->p_httpd = httpd;
vlc_object_hold( httpd );
vlc_object_attach( httpd, p_this->p_libvlc ); vlc_object_attach( httpd, p_this->p_libvlc );
} }
...@@ -1127,7 +1126,6 @@ error: ...@@ -1127,7 +1126,6 @@ error:
if( httpd->i_host <= 0 ) if( httpd->i_host <= 0 )
{ {
libvlc_priv (httpd->p_libvlc)->p_httpd = NULL; libvlc_priv (httpd->p_libvlc)->p_httpd = NULL;
vlc_object_release( httpd );
vlc_object_detach( httpd ); vlc_object_detach( httpd );
vlc_object_release( httpd ); vlc_object_release( httpd );
} }
...@@ -1199,7 +1197,6 @@ void httpd_HostDelete( httpd_host_t *host ) ...@@ -1199,7 +1197,6 @@ void httpd_HostDelete( httpd_host_t *host )
vlc_mutex_destroy( &host->lock ); vlc_mutex_destroy( &host->lock );
vlc_object_release( host ); vlc_object_release( host );
vlc_object_release( httpd );
if( httpd->i_host <= 0 ) if( httpd->i_host <= 0 )
{ {
msg_Dbg( httpd, "no hosts left, stopping httpd" ); msg_Dbg( httpd, "no hosts left, stopping httpd" );
......
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