mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Cthulhu88) Fix for multi-char arrays"

Browse Source 
This reverts commit e64cd247150de4cadaab62a574d219eef3fdbd84.
This commit is contained in:
twinaphex 2021-11-12 18:59:35 +01:00
parent fc460dbb9c
commit 753332ff18
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/netplay/netplay.h
View File

@ -191,7 +191,7 @@ struct netplay_host_list
struct netplay_mitm_pending struct netplay_mitm_pending
{ {
int *fds; int *fds;
uint8_t *ids[NETPLAY_MITM_MAX_PENDING]; uint8_t *ids[NETPLAY_MITM_ID_SIZE];
retro_time_t *timeouts; retro_time_t *timeouts;
int current; int current;

12
network/netplay/netplay_frontend.c
View File

@ -5832,15 +5832,11 @@ static int init_tcp_connection(const struct addrinfo *res,
if (fds && ids && timeouts) if (fds && ids && timeouts)
{ {
size_t i;
memset(fds, -1, memset(fds, -1,
NETPLAY_MITM_MAX_PENDING * sizeof(*fds)); NETPLAY_MITM_MAX_PENDING * sizeof(*fds));
for (i = 0; i < NETPLAY_MITM_MAX_PENDING; i++, ids += NETPLAY_MITM_ID_SIZE)
net_st->mitm_pending.ids[i] = ids;
net_st->mitm_pending.fds = fds; net_st->mitm_pending.fds = fds;
net_st->mitm_pending.ids = ids;
net_st->mitm_pending.timeouts = timeouts; net_st->mitm_pending.timeouts = timeouts;
net_st->mitm_pending.current = 0; net_st->mitm_pending.current = 0;
@ -7604,11 +7600,7 @@ void deinit_netplay(void)
net_st->mitm_pending.fds = NULL; net_st->mitm_pending.fds = NULL;
} }
if (net_st->mitm_pending.ids) if (net_st->mitm_pending.ids)
{ free(*net_st->mitm_pending.ids);
free(net_st->mitm_pending.ids[0]);
memset(net_st->mitm_pending.ids, 0,
sizeof(net_st->mitm_pending.ids));
}
if (net_st->mitm_pending.timeouts) if (net_st->mitm_pending.timeouts)
{ {
free(net_st->mitm_pending.timeouts); free(net_st->mitm_pending.timeouts);