fix error handling in libpcp to prevent endless loop (scp-fs2open#7313)

notimaginative · web-flow · commit 96af51b56ce8 · 2026-03-30T09:49:46.000-04:00
diff --git a/lib/libpcpnatpmp/src/pcp_event_handler.c b/lib/libpcpnatpmp/src/pcp_event_handler.c
@@ -834,10 +834,15 @@ static pcp_server_state_e handle_server_ping(pcp_server_t *s) {
 
             PCP_LOG_END(PCP_LOGLVL_DEBUG);
             return pss_wait_ping_resp;
+        } else {
+            gettimeofday(&s->next_timeout, NULL);
+            PCP_LOG_END(PCP_LOGLVL_DEBUG);
+            return pss_set_not_working;
         }
     }
     s->next_timeout.tv_sec = 0;
     s->next_timeout.tv_usec = 0;
+    PCP_LOG_END(PCP_LOGLVL_DEBUG);
     return pss_ping;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -834,10 +834,15 @@ static pcp_server_state_e handle_server_ping(pcp_server_t *s) {`
`834`	`834`
`835`	`835`	`PCP_LOG_END(PCP_LOGLVL_DEBUG);`
`836`	`836`	`return pss_wait_ping_resp;`
	`837`	`+ } else {`
	`838`	`+ gettimeofday(&s->next_timeout, NULL);`
	`839`	`+ PCP_LOG_END(PCP_LOGLVL_DEBUG);`
	`840`	`+ return pss_set_not_working;`
`837`	`841`	`}`
`838`	`842`	`}`
`839`	`843`	`s->next_timeout.tv_sec = 0;`
`840`	`844`	`s->next_timeout.tv_usec = 0;`
	`845`	`+ PCP_LOG_END(PCP_LOGLVL_DEBUG);`
`841`	`846`	`return pss_ping;`
`842`	`847`	`}`
`843`	`848`