Merge pull request #39 from paullouisageneau/no-null-buffer-sento

Prevent passing NULL buffer to sendto() for better compatibility with C standard libraries
paullouisageneau · Sep 3, 2024 · fb4c74e · fb4c74e
2 parents 86fdc01 + c2ff58c
commit fb4c74e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/pcp.c b/src/pcp.c
@@ -245,7 +245,8 @@ int pcp_interrupt(protocol_state_t *state, bool hard) {
 	PLUM_LOG_VERBOSE("Interrupting PCP/NAT-PMP operation");
 	atomic_store(&impl->interrupt, hard ? PCP_INTERRUPT_HARD : PCP_INTERRUPT_SOFT);
 
-	if (udp_sendto_self(impl->sock, NULL, 0) < 0) {
+	char dummy = 0; // Some C libraries might error out on NULL pointers
+	if (udp_sendto_self(impl->sock, &dummy, 0) < 0) {
 		if (sockerrno != SEAGAIN && sockerrno != SEWOULDBLOCK) {
 			PLUM_LOG_WARN(
 			    "Failed to interrupt PCP/NAT-PMP operation by triggering socket, errno=%d",

diff --git a/src/upnp.c b/src/upnp.c
@@ -220,7 +220,8 @@ int upnp_interrupt(protocol_state_t *state, bool hard) {
 	PLUM_LOG_VERBOSE("Interrupting UPnP operation");
 	atomic_store(&impl->interrupt, hard ? UPNP_INTERRUPT_HARD : UPNP_INTERRUPT_SOFT);
 
-	if (udp_sendto_self(impl->sock, NULL, 0) < 0) {
+	char dummy = 0; // Some C libraries might error out on NULL pointers
+	if (udp_sendto_self(impl->sock, &dummy, 0) < 0) {
 		if (sockerrno != SEAGAIN && sockerrno != SEWOULDBLOCK) {
 			PLUM_LOG_WARN("Failed to interrupt UPnP operation by triggering socket, errno=%d",
 			              sockerrno);