Skip to content

V
vlc-1.1
Commit d8a8f2de authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* src/extras/libc.c: Fixed Win32 compilation. 

 * modules/control/http/http.c: Fixed a memory leak with the CGI environment.
parent fe927c0f
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 34 deletions
modules/control/http/http.c
View file @ d8a8f2de
...@@ -613,12 +613,13 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -613,12 +613,13 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
int i_request = p_request != NULL ? strlen( p_request ) : 0; int i_request = p_request != NULL ? strlen( p_request ) : 0;
char *p; char *p;
int i_env = 0; int i_env = 0;
char **pp_env = NULL; char **ppsz_env = NULL;
char *psz_tmp; char *psz_tmp;
char sep; char sep;
int i_buffer; int i_buffer;
char *p_buffer; char *p_buffer;
char *psz_cwd; char *psz_cwd;
int i_ret;
#ifdef WIN32 #ifdef WIN32
sep = '\\'; sep = '\\';
...@@ -627,20 +628,20 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -627,20 +628,20 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
#endif #endif
/* Create environment for the CGI */ /* Create environment for the CGI */
TAB_APPEND( i_env, pp_env, strdup("GATEWAY_INTERFACE=CGI/1.1") ); TAB_APPEND( i_env, ppsz_env, strdup("GATEWAY_INTERFACE=CGI/1.1") );
TAB_APPEND( i_env, pp_env, strdup("SERVER_PROTOCOL=HTTP/1.1") ); TAB_APPEND( i_env, ppsz_env, strdup("SERVER_PROTOCOL=HTTP/1.1") );
TAB_APPEND( i_env, pp_env, strdup("SERVER_SOFTWARE=" COPYRIGHT_MESSAGE) ); TAB_APPEND( i_env, ppsz_env, strdup("SERVER_SOFTWARE=" COPYRIGHT_MESSAGE) );
switch( i_type ) switch( i_type )
{ {
case HTTPD_MSG_GET: case HTTPD_MSG_GET:
TAB_APPEND( i_env, pp_env, strdup("REQUEST_METHOD=GET") ); TAB_APPEND( i_env, ppsz_env, strdup("REQUEST_METHOD=GET") );
break; break;
case HTTPD_MSG_POST: case HTTPD_MSG_POST:
TAB_APPEND( i_env, pp_env, strdup("REQUEST_METHOD=POST") ); TAB_APPEND( i_env, ppsz_env, strdup("REQUEST_METHOD=POST") );
break; break;
case HTTPD_MSG_HEAD: case HTTPD_MSG_HEAD:
TAB_APPEND( i_env, pp_env, strdup("REQUEST_METHOD=HEAD") ); TAB_APPEND( i_env, ppsz_env, strdup("REQUEST_METHOD=HEAD") );
break; break;
default: default:
break; break;
...@@ -650,50 +651,50 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -650,50 +651,50 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
{ {
psz_tmp = malloc( sizeof("QUERY_STRING=") + i_request ); psz_tmp = malloc( sizeof("QUERY_STRING=") + i_request );
sprintf( psz_tmp, "QUERY_STRING=%s", p_request ); sprintf( psz_tmp, "QUERY_STRING=%s", p_request );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
psz_tmp = malloc( sizeof("REQUEST_URI=?") + strlen(p_url) psz_tmp = malloc( sizeof("REQUEST_URI=?") + strlen(p_url)
+ i_request ); + i_request );
sprintf( psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request ); sprintf( psz_tmp, "REQUEST_URI=%s?%s", p_url, p_request );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
} }
else else
{ {
psz_tmp = malloc( sizeof("REQUEST_URI=") + strlen(p_url) ); psz_tmp = malloc( sizeof("REQUEST_URI=") + strlen(p_url) );
sprintf( psz_tmp, "REQUEST_URI=%s", p_url ); sprintf( psz_tmp, "REQUEST_URI=%s", p_url );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
} }
psz_tmp = malloc( sizeof("SCRIPT_NAME=") + strlen(p_url) ); psz_tmp = malloc( sizeof("SCRIPT_NAME=") + strlen(p_url) );
sprintf( psz_tmp, "SCRIPT_NAME=%s", p_url ); sprintf( psz_tmp, "SCRIPT_NAME=%s", p_url );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
psz_tmp = malloc( sizeof("SCRIPT_FILENAME=") + strlen(p_args->file.file) ); psz_tmp = malloc( sizeof("SCRIPT_FILENAME=") + strlen(p_args->file.file) );
sprintf( psz_tmp, "SCRIPT_FILENAME=%s", p_args->file.file ); sprintf( psz_tmp, "SCRIPT_FILENAME=%s", p_args->file.file );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
#define p_sys p_args->file.p_intf->p_sys #define p_sys p_args->file.p_intf->p_sys
psz_tmp = malloc( sizeof("SERVER_NAME=") + strlen(p_sys->psz_address) ); psz_tmp = malloc( sizeof("SERVER_NAME=") + strlen(p_sys->psz_address) );
sprintf( psz_tmp, "SERVER_NAME=%s", p_sys->psz_address ); sprintf( psz_tmp, "SERVER_NAME=%s", p_sys->psz_address );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
psz_tmp = malloc( sizeof("SERVER_PORT=") + 5 ); psz_tmp = malloc( sizeof("SERVER_PORT=") + 5 );
sprintf( psz_tmp, "SERVER_PORT=%u", p_sys->i_port ); sprintf( psz_tmp, "SERVER_PORT=%u", p_sys->i_port );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
#undef p_sys #undef p_sys
if( psz_remote_addr != NULL && *psz_remote_addr ) if( psz_remote_addr != NULL && *psz_remote_addr )
{ {
psz_tmp = malloc( sizeof("REMOTE_ADDR=") + strlen(psz_remote_addr) ); psz_tmp = malloc( sizeof("REMOTE_ADDR=") + strlen(psz_remote_addr) );
sprintf( psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr ); sprintf( psz_tmp, "REMOTE_ADDR=%s", psz_remote_addr );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
} }
if( psz_remote_host != NULL && *psz_remote_host ) if( psz_remote_host != NULL && *psz_remote_host )
{ {
psz_tmp = malloc( sizeof("REMOTE_HOST=") + strlen(psz_remote_host) ); psz_tmp = malloc( sizeof("REMOTE_HOST=") + strlen(psz_remote_host) );
sprintf( psz_tmp, "REMOTE_HOST=%s", psz_remote_host ); sprintf( psz_tmp, "REMOTE_HOST=%s", psz_remote_host );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
} }
if( i_in ) if( i_in )
...@@ -709,7 +710,7 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -709,7 +710,7 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
*end = '\0'; *end = '\0';
psz_tmp = malloc( sizeof("CONTENT_TYPE=") + strlen(p) ); psz_tmp = malloc( sizeof("CONTENT_TYPE=") + strlen(p) );
sprintf( psz_tmp, "CONTENT_TYPE=%s", p ); sprintf( psz_tmp, "CONTENT_TYPE=%s", p );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
*end = '\r'; *end = '\r';
} }
if( !strncmp( p, "Content-Length: ", strlen("Content-Length: ") ) ) if( !strncmp( p, "Content-Length: ", strlen("Content-Length: ") ) )
...@@ -720,7 +721,7 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -720,7 +721,7 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
*end = '\0'; *end = '\0';
psz_tmp = malloc( sizeof("CONTENT_LENGTH=") + strlen(p) ); psz_tmp = malloc( sizeof("CONTENT_LENGTH=") + strlen(p) );
sprintf( psz_tmp, "CONTENT_LENGTH=%s", p ); sprintf( psz_tmp, "CONTENT_LENGTH=%s", p );
TAB_APPEND( i_env, pp_env, psz_tmp ); TAB_APPEND( i_env, ppsz_env, psz_tmp );
*end = '\r'; *end = '\r';
} }
...@@ -734,7 +735,7 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -734,7 +735,7 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
} }
} }
TAB_APPEND( i_env, pp_env, NULL ); TAB_APPEND( i_env, ppsz_env, NULL );
TAB_APPEND( p_args->p_association->i_argc, p_args->p_association->ppsz_argv, TAB_APPEND( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
p_args->file.file ); p_args->file.file );
...@@ -754,27 +755,23 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args, ...@@ -754,27 +755,23 @@ int E_(HandlerCallback)( httpd_handler_sys_t *p_args,
psz_cwd = NULL; psz_cwd = NULL;
} }
if( vlc_execve( p_args->file.p_intf, p_args->p_association->i_argc, i_ret = vlc_execve( p_args->file.p_intf, p_args->p_association->i_argc,
p_args->p_association->ppsz_argv, pp_env, psz_cwd, p_args->p_association->ppsz_argv, ppsz_env, psz_cwd,
(char *)p_in, i_in, &p_buffer, &i_buffer ) == -1 ) (char *)p_in, i_in, &p_buffer, &i_buffer );
{
TAB_REMOVE( p_args->p_association->i_argc,
p_args->p_association->ppsz_argv, NULL );
TAB_REMOVE( p_args->p_association->i_argc,
p_args->p_association->ppsz_argv, p_args->file.file );
if( psz_cwd != NULL )
free( psz_cwd );
Callback404( (httpd_file_sys_t *)p_args, pp_data, pi_data );
return VLC_SUCCESS;
}
TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv, TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
NULL ); NULL );
TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv, TAB_REMOVE( p_args->p_association->i_argc, p_args->p_association->ppsz_argv,
p_args->file.file ); p_args->file.file );
if( psz_cwd != NULL ) if( psz_cwd != NULL )
free( psz_cwd ); free( psz_cwd );
while( i_env )
TAB_REMOVE( i_env, ppsz_env, ppsz_env[0] );
if( i_ret == -1 )
{
Callback404( (httpd_file_sys_t *)p_args, pp_data, pi_data );
return VLC_SUCCESS;
}
p = p_buffer; p = p_buffer;
while( strncmp( p, "Content-Type: text/html", while( strncmp( p, "Content-Type: text/html",
strlen("Content-Type: text/html") ) ) strlen("Content-Type: text/html") ) )
......
src/extras/libc.c
View file @ d8a8f2de
...@@ -942,7 +942,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv, ...@@ -942,7 +942,7 @@ int __vlc_execve( vlc_object_t *p_object, int i_argc, char **ppsz_argv,
} }
#else #else
msg_Err( p_intf, "vlc_execve called but no implementation is available" ); msg_Err( p_object, "vlc_execve called but no implementation is available" );
return -1; return -1;
#endif #endif
......
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