wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-06 15:51:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mg_lwip_if_get_conn_addr when there's no pcb

Browse Source 
Connection may not (yet) have a TCP or UDP PCB associated with it.
mg_lwip_if_get_conn_addr should not crash in this case.

PUBLISHED_FROM=fd0ed683b18b3f549135c9d79eeadfc7348ab05a
This commit is contained in:
Deomid Ryabkov authored and Cesanta Bot committed 2017-04-21 19:33:17 +00:00
1 parent cd9c7dcbec
commit 49bbfaf130
1 file changed
+4 -5
Download Patch File Download Diff File Expand all files Collapse all files
mongoose.c
+4 -5
View File
@@ -14562,22 +14562,21 @@ void mg_lwip_if_destroy_conn(struct mg_connection *nc) {
void mg_lwip_if_get_conn_addr(struct mg_connection *nc, int remote, void mg_lwip_if_get_conn_addr(struct mg_connection *nc, int remote,
union socket_address *sa) { union socket_address *sa) {
memset(sa, 0, sizeof(*sa)); memset(sa, 0, sizeof(*sa));
if (nc->sock == INVALID_SOCKET) return; if (nc == NULL || nc->sock == INVALID_SOCKET) return;
struct mg_lwip_conn_state *cs = (struct mg_lwip_conn_state *) nc->sock; struct mg_lwip_conn_state *cs = (struct mg_lwip_conn_state *) nc->sock;
if (nc->flags & MG_F_UDP) { if (nc->flags & MG_F_UDP) {
struct udp_pcb *upcb = cs->pcb.udp; struct udp_pcb *upcb = cs->pcb.udp;
if (remote) { if (remote) {
memcpy(sa, &nc->sa, sizeof(*sa)); memcpy(sa, &nc->sa, sizeof(*sa));
} else { } else if (upcb != NULL) {
sa->sin.sin_port = htons(upcb->local_port); sa->sin.sin_port = htons(upcb->local_port);
SET_ADDR(sa, &upcb->local_ip); SET_ADDR(sa, &upcb->local_ip);
} }
} else { } else {
struct tcp_pcb *tpcb = cs->pcb.tcp; struct tcp_pcb *tpcb = cs->pcb.tcp;
if (remote) { if (remote) {
sa->sin.sin_port = htons(tpcb->remote_port); memcpy(sa, &nc->sa, sizeof(*sa));
SET_ADDR(sa, &tpcb->remote_ip); } else if (tpcb != NULL) {
} else {
sa->sin.sin_port = htons(tpcb->local_port); sa->sin.sin_port = htons(tpcb->local_port);
SET_ADDR(sa, &tpcb->local_ip); SET_ADDR(sa, &tpcb->local_ip);
} }