mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-28 23:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

httpd: fix bug #64458: When tcp_err() is invoked, tcp_pcb is freed but httpd_post_finished() is not called by httpd.c

Browse Source
This commit is contained in:
Simon Goldschmidt 2023-10-10 20:40:42 +02:00
parent b5f6720f88
commit ab1f582043
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/apps/http/httpd.c
View File

@ -471,6 +471,32 @@ http_state_alloc(void)
return ret; return ret;
} }
/** Make sure the post code knows that the connection is closed */
static void
http_state_close_post(struct http_state* hs)
{
#if LWIP_HTTPD_SUPPORT_POST
if (hs != NULL) {
if ((hs->post_content_len_left != 0)
#if LWIP_HTTPD_POST_MANUAL_WND
|| ((hs->no_auto_wnd != 0) && (hs->unrecved_bytes != 0))
#endif /* LWIP_HTTPD_POST_MANUAL_WND */
) {
/* prevent calling httpd_post_finished twice */
hs->post_content_len_left = 0;
#if LWIP_HTTPD_POST_MANUAL_WND
hs->unrecved_bytes = 0;
#endif /* LWIP_HTTPD_POST_MANUAL_WND */
/* make sure the post code knows that the connection is closed */
http_uri_buf[0] = 0;
httpd_post_finished(hs, http_uri_buf, LWIP_HTTPD_URI_BUF_LEN);
}
}
#else /* LWIP_HTTPD_SUPPORT_POST*/
LWIP_UNUSED_ARG(hs);
#endif /* LWIP_HTTPD_SUPPORT_POST*/
}
/** Free a struct http_state. /** Free a struct http_state.
* Also frees the file data if dynamic. * Also frees the file data if dynamic.
*/ */
@ -505,6 +531,7 @@ http_state_eof(struct http_state *hs)
hs->req = NULL; hs->req = NULL;
} }
#endif /* LWIP_HTTPD_SUPPORT_REQUESTLIST */ #endif /* LWIP_HTTPD_SUPPORT_REQUESTLIST */
http_state_close_post(hs);
} }
/** Free a struct http_state. /** Free a struct http_state.
@ -598,20 +625,7 @@ http_close_or_abort_conn(struct altcp_pcb *pcb, struct http_state *hs, u8_t abor
err_t err; err_t err;
LWIP_DEBUGF(HTTPD_DEBUG, ("Closing connection %p\n", (void *)pcb)); LWIP_DEBUGF(HTTPD_DEBUG, ("Closing connection %p\n", (void *)pcb));
#if LWIP_HTTPD_SUPPORT_POST http_state_close_post(hs);
if (hs != NULL) {
if ((hs->post_content_len_left != 0)
#if LWIP_HTTPD_POST_MANUAL_WND
|| ((hs->no_auto_wnd != 0) && (hs->unrecved_bytes != 0))
#endif /* LWIP_HTTPD_POST_MANUAL_WND */
) {
/* make sure the post code knows that the connection is closed */
http_uri_buf[0] = 0;
httpd_post_finished(hs, http_uri_buf, LWIP_HTTPD_URI_BUF_LEN);
}
}
#endif /* LWIP_HTTPD_SUPPORT_POST*/
altcp_arg(pcb, NULL); altcp_arg(pcb, NULL);
altcp_recv(pcb, NULL); altcp_recv(pcb, NULL);
@ -2401,7 +2415,7 @@ http_init_file(struct http_state *hs, struct fs_file *file, int is_09, const cha
search for the end of the header. */ search for the end of the header. */
char *file_start = lwip_strnstr(hs->file, CRLF CRLF, hs->left); char *file_start = lwip_strnstr(hs->file, CRLF CRLF, hs->left);
if (file_start != NULL) { if (file_start != NULL) {
int diff = file_start + 4 - hs->file; size_t diff = file_start + 4 - hs->file;
hs->file += diff; hs->file += diff;
hs->left -= (u32_t)diff; hs->left -= (u32_t)diff;
} }