mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-11 12:14:41 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #3139 from cesanta/freewill

Browse Source 
free ifp on mgr_free
This commit is contained in:
Sergio R. Caprile 2025-05-15 18:04:42 -03:00 committed by GitHub
commit 39392b3690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mongoose.c
View File

@ -4127,6 +4127,9 @@ void mg_mgr_free(struct mg_mgr *mgr) {
if (mgr->epoll_fd >= 0) close(mgr->epoll_fd), mgr->epoll_fd = -1; if (mgr->epoll_fd >= 0) close(mgr->epoll_fd), mgr->epoll_fd = -1;
#endif #endif
mg_tls_ctx_free(mgr); mg_tls_ctx_free(mgr);
#if MG_ENABLE_TCPIP
if (mgr->ifp) mg_tcpip_free(mgr->ifp);
#endif
} }
void mg_mgr_init(struct mg_mgr *mgr) { void mg_mgr_init(struct mg_mgr *mgr) {
@ -4162,7 +4165,7 @@ void mg_mgr_init(struct mg_mgr *mgr) {
#endif #endif
#if defined(MG_ENABLE_TCPIP) && MG_ENABLE_TCPIP #if MG_ENABLE_TCPIP
#define MG_EPHEMERAL_PORT_BASE 32768 #define MG_EPHEMERAL_PORT_BASE 32768
#define PDIFF(a, b) ((size_t) (((char *) (b)) - ((char *) (a)))) #define PDIFF(a, b) ((size_t) (((char *) (b)) - ((char *) (a))))

3
src/net.c
View File

@ -247,6 +247,9 @@ void mg_mgr_free(struct mg_mgr *mgr) {
if (mgr->epoll_fd >= 0) close(mgr->epoll_fd), mgr->epoll_fd = -1; if (mgr->epoll_fd >= 0) close(mgr->epoll_fd), mgr->epoll_fd = -1;
#endif #endif
mg_tls_ctx_free(mgr); mg_tls_ctx_free(mgr);
#if MG_ENABLE_TCPIP
if (mgr->ifp) mg_tcpip_free(mgr->ifp);
#endif
} }
void mg_mgr_init(struct mg_mgr *mgr) { void mg_mgr_init(struct mg_mgr *mgr) {

2
src/net_builtin.c
View File

@ -1,6 +1,6 @@
#include "net_builtin.h" #include "net_builtin.h"
#if defined(MG_ENABLE_TCPIP) && MG_ENABLE_TCPIP #if MG_ENABLE_TCPIP
#define MG_EPHEMERAL_PORT_BASE 32768 #define MG_EPHEMERAL_PORT_BASE 32768
#define PDIFF(a, b) ((size_t) (((char *) (b)) - ((char *) (a)))) #define PDIFF(a, b) ((size_t) (((char *) (b)) - ((char *) (a))))

2
test/fuzz.c
View File

@ -145,9 +145,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
mg_iobuf_add(&c->recv, 0, data, size); mg_iobuf_add(&c->recv, 0, data, size);
c->pfn(c, MG_EV_READ, NULL); // manually invoke protocol event handler c->pfn(c, MG_EV_READ, NULL); // manually invoke protocol event handler
mg_mgr_free(&mgr);
free(pkt); free(pkt);
mg_tcpip_free(&mif);
} }
return 0; return 0;

1
test/mip_tap_test.c
View File

@ -471,7 +471,6 @@ int main(void) {
// Clear // Clear
mg_mgr_free(&mgr); mg_mgr_free(&mgr);
mg_tcpip_free(&mif); // Release after mg_mgr
ASSERT(mgr.conns == NULL); // Deconstruction OK ASSERT(mgr.conns == NULL); // Deconstruction OK
close(fd); close(fd);
return 0; return 0;

4
test/mip_test.c
View File

@ -80,7 +80,6 @@ static void test_poll(void) {
mg_http_listen(&mgr, "http://127.0.0.1:12346", ph, &count); mg_http_listen(&mgr, "http://127.0.0.1:12346", ph, &count);
for (i = 0; i < 10; i++) mg_mgr_poll(&mgr, 0); for (i = 0; i < 10; i++) mg_mgr_poll(&mgr, 0);
ASSERT(count == 10); ASSERT(count == 10);
mg_tcpip_free(&mif);
mg_mgr_free(&mgr); mg_mgr_free(&mgr);
} }
@ -240,7 +239,6 @@ static void test_retransmit(void) {
s_driver_data.len = 0; s_driver_data.len = 0;
mg_mgr_free(&mgr); mg_mgr_free(&mgr);
mg_tcpip_free(&mif);
} }
static void test_frag_recv_path(void) { static void test_frag_recv_path(void) {
@ -284,7 +282,6 @@ static void test_frag_recv_path(void) {
s_driver_data.len = 0; s_driver_data.len = 0;
mg_mgr_free(&mgr); mg_mgr_free(&mgr);
mg_tcpip_free(&mif);
} }
static void test_frag_send_path(void) { static void test_frag_send_path(void) {
@ -307,7 +304,6 @@ static void test_frag_send_path(void) {
ASSERT(s_seg_sent == 3); ASSERT(s_seg_sent == 3);
s_driver_data.len = 0; s_driver_data.len = 0;
mg_mgr_free(&mgr); mg_mgr_free(&mgr);
mg_tcpip_free(&mif);
} }
static void test_fragmentation(void) { static void test_fragmentation(void) {