Commit fb04f249 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Fix NULL pointer deferences (CID 120 & 121)

parent 47e1374a
...@@ -394,7 +394,6 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, ...@@ -394,7 +394,6 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
httpd_message_t *answer, const httpd_message_t *query ) httpd_message_t *answer, const httpd_message_t *query )
{ {
httpd_file_t *file = (httpd_file_t*)p_sys; httpd_file_t *file = (httpd_file_t*)p_sys;
uint8_t *psz_args = query->psz_args;
uint8_t **pp_body, *p_body; uint8_t **pp_body, *p_body;
const char *psz_connection; const char *psz_connection;
int *pi_body, i_body; int *pi_body, i_body;
...@@ -431,6 +430,7 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, ...@@ -431,6 +430,7 @@ httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
/* msg_Warn not supported */ /* msg_Warn not supported */
} }
uint8_t *psz_args = query->psz_args;
file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body ); file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body );
if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL ) if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL )
...@@ -520,7 +520,6 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, ...@@ -520,7 +520,6 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
httpd_message_t *answer, const httpd_message_t *query ) httpd_message_t *answer, const httpd_message_t *query )
{ {
httpd_handler_t *handler = (httpd_handler_t*)p_sys; httpd_handler_t *handler = (httpd_handler_t*)p_sys;
uint8_t *psz_args = query->psz_args;
char psz_remote_addr[NI_MAXNUMERICHOST]; char psz_remote_addr[NI_MAXNUMERICHOST];
if( answer == NULL || query == NULL ) if( answer == NULL || query == NULL )
...@@ -536,6 +535,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, ...@@ -536,6 +535,7 @@ httpd_HandlerCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl,
if( httpd_ClientIP( cl, psz_remote_addr ) == NULL ) if( httpd_ClientIP( cl, psz_remote_addr ) == NULL )
*psz_remote_addr = '\0'; *psz_remote_addr = '\0';
uint8_t *psz_args = query->psz_args;
handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args, handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args,
query->i_type, query->p_body, query->i_body, query->i_type, query->p_body, query->i_body,
psz_remote_addr, NULL, psz_remote_addr, NULL,
......
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