Skip to content

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

Fixes invalid memory access in case of TLS handshake failure

parent 9207dd48
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/misc/httpd.c
View file @ 0943126a
/***************************************************************************** /*****************************************************************************
* httpd.c * httpd.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004-2005 VideoLAN
* $Id$ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
...@@ -2478,7 +2478,6 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2478,7 +2478,6 @@ static void httpd_HostThread( httpd_host_t *host )
fcntl( fd, F_SETFL, O_NONBLOCK ); fcntl( fd, F_SETFL, O_NONBLOCK );
#endif #endif
/* FIXME: that MUST be non-blocking */
if( p_tls != NULL) if( p_tls != NULL)
{ {
switch ( tls_SessionHandshake( p_tls, fd ) ) switch ( tls_SessionHandshake( p_tls, fd ) )
...@@ -2487,6 +2486,7 @@ static void httpd_HostThread( httpd_host_t *host ) ...@@ -2487,6 +2486,7 @@ static void httpd_HostThread( httpd_host_t *host )
msg_Err( host, "Rejecting TLS connection" ); msg_Err( host, "Rejecting TLS connection" );
net_Close( fd ); net_Close( fd );
fd = -1; fd = -1;
p_tls = NULL;
break; break;
case 1: /* missing input - most likely */ case 1: /* missing input - most likely */
......
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