stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 21:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1200-next-cannot-load-game-when-using-srb2-launcher' into 'next'

Browse source 
Do not alllow error codepaths of UPnP to leave the mutex locked

Closes #1200

See merge request STJr/SRB2!2349
This commit is contained in:
Logan Aerl Arias 2024-02-20 00:36:39 +00:00
commit a8a92a57a7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/netcode/i_tcp.c
View file

@ -265,7 +265,7 @@ static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len
#ifdef HAVE_MINIUPNPC // based on old XChat patch #ifdef HAVE_MINIUPNPC // based on old XChat patch
static void I_ShutdownUPnP(void); static void I_ShutdownUPnP(void);
static void I_InitUPnP(void); static void I_InitUPnP(void);
I_mutex upnp_mutex; static I_mutex upnp_mutex;
static struct UPNPUrls urls; static struct UPNPUrls urls;
static struct IGDdatas data; static struct IGDdatas data;
static char lanaddr[64]; static char lanaddr[64];
@ -335,22 +335,22 @@ init_upnpc_once(struct upnpdata *upnpuserdata)
I_AddExitFunc(I_ShutdownUPnP); I_AddExitFunc(I_ShutdownUPnP);
} }
freeUPNPDevlist(devlist); freeUPNPDevlist(devlist);
I_unlock_mutex(upnp_mutex);
} }
else if (upnp_error == UPNPDISCOVER_SOCKET_ERROR) else if (upnp_error == UPNPDISCOVER_SOCKET_ERROR)
{ {
I_OutputMsg(M_GetText("No UPnP devices discovered\n")); I_OutputMsg(M_GetText("No UPnP devices discovered\n"));
} }
I_unlock_mutex(upnp_mutex);
upnpuserdata->upnpc_started =1; upnpuserdata->upnpc_started =1;
} }
static inline void I_UPnP_add(const char * addr, const char *port, const char * servicetype) static inline void I_UPnP_add(const char * addr, const char *port, const char * servicetype)
{ {
if (!urls.controlURL || urls.controlURL[0] == '\0')
return;
I_lock_mutex(&upnp_mutex); I_lock_mutex(&upnp_mutex);
if (addr == NULL) if (addr == NULL)
addr = lanaddr; addr = lanaddr;
if (!urls.controlURL || urls.controlURL[0] == '\0')
return;
UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
port, port, addr, "SRB2", servicetype, NULL, NULL); port, port, addr, "SRB2", servicetype, NULL, NULL);
I_unlock_mutex(upnp_mutex); I_unlock_mutex(upnp_mutex);
@ -358,9 +358,9 @@ static inline void I_UPnP_add(const char * addr, const char *port, const char *
static inline void I_UPnP_rem(const char *port, const char * servicetype) static inline void I_UPnP_rem(const char *port, const char * servicetype)
{ {
I_lock_mutex(&upnp_mutex);
if (!urls.controlURL || urls.controlURL[0] == '\0') if (!urls.controlURL || urls.controlURL[0] == '\0')
return; return;
I_lock_mutex(&upnp_mutex);
UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype,
port, servicetype, NULL); port, servicetype, NULL);
I_unlock_mutex(upnp_mutex); I_unlock_mutex(upnp_mutex);