mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-19 19:40:56 +00:00
Add overrun protection to mg_sock_to_str
Relate to cesanta/mongoose#780 PUBLISHED_FROM=145d94c52be03ac2d909eae8166774ffd40f0df1
This commit is contained in:
1 parent
6e8d4129b2
commit
a58d21aa28
1 file changed
+19
-6
+19
-6
@@ -9128,7 +9128,7 @@ void mg_sock_addr_to_str(const union socket_address *sa, char *buf, size_t len,
|
|||||||
int flags) {
|
int flags) {
|
||||||
int is_v6;
|
int is_v6;
|
||||||
if (buf == NULL || len <= 0) return;
|
if (buf == NULL || len <= 0) return;
|
||||||
buf[0] = '\0';
|
memset(buf, 0, len);
|
||||||
#if MG_ENABLE_IPV6
|
#if MG_ENABLE_IPV6
|
||||||
is_v6 = sa->sa.sa_family == AF_INET6;
|
is_v6 = sa->sa.sa_family == AF_INET6;
|
||||||
#else
|
#else
|
||||||
@@ -9150,24 +9150,37 @@ void mg_sock_addr_to_str(const union socket_address *sa, char *buf, size_t len,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (inet_ntop(sa->sa.sa_family, addr, start, capacity) == NULL) {
|
if (inet_ntop(sa->sa.sa_family, addr, start, capacity) == NULL) {
|
||||||
*buf = '\0';
|
goto cleanup;
|
||||||
}
|
}
|
||||||
#elif defined(_WIN32) || MG_LWIP || (MG_NET_IF == MG_NET_IF_PIC32)
|
#elif defined(_WIN32) || MG_LWIP || (MG_NET_IF == MG_NET_IF_PIC32)
|
||||||
/* Only Windoze Vista (and newer) have inet_ntop() */
|
/* Only Windoze Vista (and newer) have inet_ntop() */
|
||||||
strncpy(buf, inet_ntoa(sa->sin.sin_addr), len);
|
char *addr_str = inet_ntoa(sa->sin.sin_addr);
|
||||||
|
if (addr_str != NULL) {
|
||||||
|
strncpy(buf, inet_ntoa(sa->sin.sin_addr), len - 1);
|
||||||
|
} else {
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
inet_ntop(AF_INET, (void *) &sa->sin.sin_addr, buf, len);
|
if (inet_ntop(AF_INET, (void *) &sa->sin.sin_addr, buf, len - 1) == NULL) {
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
if (flags & MG_SOCK_STRINGIFY_PORT) {
|
if (flags & MG_SOCK_STRINGIFY_PORT) {
|
||||||
int port = ntohs(sa->sin.sin_port);
|
int port = ntohs(sa->sin.sin_port);
|
||||||
if (flags & MG_SOCK_STRINGIFY_IP) {
|
if (flags & MG_SOCK_STRINGIFY_IP) {
|
||||||
snprintf(buf + strlen(buf), len - (strlen(buf) + 1), "%s:%d",
|
int buf_len = strlen(buf);
|
||||||
(is_v6 ? "]" : ""), port);
|
snprintf(buf + buf_len, len - (buf_len + 1), "%s:%d", (is_v6 ? "]" : ""),
|
||||||
|
port);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, len, "%d", port);
|
snprintf(buf, len, "%d", port);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
*buf = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
void mg_conn_addr_to_str(struct mg_connection *nc, char *buf, size_t len,
|
void mg_conn_addr_to_str(struct mg_connection *nc, char *buf, size_t len,
|
||||||
|
|||||||
Reference in new issue
Block a user