backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

Fix recursion in WSHEnumProtocols() function.

Browse Source
This commit is contained in:
Daniel Collins 2024-06-26 22:32:36 +01:00
parent b4e4480d75
commit 379f3d6eb6
3 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ipxwrapper.h
View File

@ -215,6 +215,7 @@ void add_self_to_firewall(void);
INT APIENTRY r_EnumProtocolsA(LPINT,LPVOID,LPDWORD); INT APIENTRY r_EnumProtocolsA(LPINT,LPVOID,LPDWORD);
INT APIENTRY r_EnumProtocolsW(LPINT,LPVOID,LPDWORD); INT APIENTRY r_EnumProtocolsW(LPINT,LPVOID,LPDWORD);
INT WINAPI r_WSHEnumProtocols(LPINT protocols, LPWSTR lpTransportKeyName, LPVOID buf, LPDWORD bsptr);
int PASCAL FAR r_WSARecvEx(SOCKET,char*,int,int*); int PASCAL FAR r_WSARecvEx(SOCKET,char*,int,int*);
int WSAAPI r_bind(SOCKET,const struct sockaddr*,int); int WSAAPI r_bind(SOCKET,const struct sockaddr*,int);
int WSAAPI r_closesocket(SOCKET); int WSAAPI r_closesocket(SOCKET);

1
src/ipxwrapper_stubs.txt
View File

@ -19,6 +19,7 @@ WSAResetEvent ws2_32.dll WSAResetEvent 4
WSASetEvent ws2_32.dll WSASetEvent 4 WSASetEvent ws2_32.dll WSASetEvent 4
r_EnumProtocolsA mswsock.dll EnumProtocolsA 12 r_EnumProtocolsA mswsock.dll EnumProtocolsA 12
r_EnumProtocolsW mswsock.dll EnumProtocolsW 12 r_EnumProtocolsW mswsock.dll EnumProtocolsW 12
r_WSHEnumProtocols mswsock.dll WSHEnumProtocols 16
r_WSARecvEx mswsock.dll WSARecvEx 16 r_WSARecvEx mswsock.dll WSARecvEx 16
r_bind ws2_32.dll bind 12 r_bind ws2_32.dll bind 12
r_closesocket ws2_32.dll closesocket 4 r_closesocket ws2_32.dll closesocket 4

137
src/winsock.c
View File

@ -96,41 +96,31 @@ static int _max_ipx_payload(void)
} while(name[i++] != '\0'); \ } while(name[i++] != '\0'); \
} }
static int do_EnumProtocols(LPINT protocols, LPVOID buf, LPDWORD bsptr, bool unicode) static int do_EnumProtocols(LPINT lpiProtocols, LPVOID lpProtocolBuffer, LPDWORD lpdwBufferLength, bool unicode, int sys_result, DWORD real_bufsize)
{ {
/* Determine which IPX protocols should be added to the list. */ /* Determine which IPX protocols should be added to the list. */
bool want_ipx = !protocols; bool want_ipx = !lpiProtocols;
bool want_spx = !protocols; bool want_spx = !lpiProtocols;
bool want_spxii = !protocols; bool want_spxii = !lpiProtocols;
for(int i = 0; protocols && protocols[i]; ++i) for(int i = 0; lpiProtocols && lpiProtocols[i]; ++i)
{ {
if(protocols[i] == NSPROTO_IPX) if(lpiProtocols[i] == NSPROTO_IPX)
{ {
want_ipx = true; want_ipx = true;
} }
else if(protocols[i] == NSPROTO_SPX) else if(lpiProtocols[i] == NSPROTO_SPX)
{ {
want_spx = true; want_spx = true;
} }
else if(protocols[i] == NSPROTO_SPXII) else if(lpiProtocols[i] == NSPROTO_SPXII)
{ {
want_spxii = true; want_spxii = true;
} }
} }
/* Stash the true buffer size and call EnumProtocols to get any if(sys_result == -1 && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
* protocols provided by the OS.
*/
DWORD bufsize = *bsptr;
int rval = unicode
? r_EnumProtocolsW(protocols, buf, bsptr)
: r_EnumProtocolsA(protocols, buf, bsptr);
if(rval == -1 && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
{ {
return -1; return -1;
} }
@ -141,42 +131,38 @@ static int do_EnumProtocols(LPINT protocols, LPVOID buf, LPDWORD bsptr, bool uni
if(want_ipx) if(want_ipx)
{ {
*bsptr += sizeof(PROTOCOL_INFO) + (strlen("IPX") + 1) * (!!unicode + 1); *lpdwBufferLength += sizeof(PROTOCOL_INFO) + (strlen("IPX") + 1) * (!!unicode + 1);
} }
if(want_spx) if(want_spx)
{ {
*bsptr += sizeof(PROTOCOL_INFO) + (strlen("SPX") + 1) * (!!unicode + 1); *lpdwBufferLength += sizeof(PROTOCOL_INFO) + (strlen("SPX") + 1) * (!!unicode + 1);
} }
if(want_spxii) if(want_spxii)
{ {
*bsptr += sizeof(PROTOCOL_INFO) + (strlen("SPX II") + 1) * (!!unicode + 1); *lpdwBufferLength += sizeof(PROTOCOL_INFO) + (strlen("SPX II") + 1) * (!!unicode + 1);
} }
if(*bsptr > bufsize) if(*lpdwBufferLength > real_bufsize || sys_result == -1)
{ {
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
return -1; return -1;
} }
if(rval == -1)
{
return -1;
}
/* Remove any IPX/SPX protocols from the list the native EnumProtocols /* Remove any IPX/SPX protocols from the list the native EnumProtocols
* function returned; this is to force the data for the IPX types to be * function returned; this is to force the data for the IPX types to be
* the same under all Windows versions. * the same under all Windows versions.
*/ */
PROTOCOL_INFO *pinfo = buf; PROTOCOL_INFO *pinfo = lpProtocolBuffer;
int our_result = sys_result;
for(int i = 0; i < rval;) for(int i = 0; i < our_result;)
{ {
if(pinfo[i].iAddressFamily == AF_IPX) if(pinfo[i].iAddressFamily == AF_IPX)
{ {
pinfo[i] = pinfo[--rval]; pinfo[i] = pinfo[--our_result];
} }
else{ else{
++i; ++i;
@ -191,9 +177,9 @@ static int do_EnumProtocols(LPINT protocols, LPVOID buf, LPDWORD bsptr, bool uni
size_t name_buf_size = 0; size_t name_buf_size = 0;
for(int i = 0; i < rval; ++i) for(int i = 0; i < our_result; ++i)
{ {
if(pinfo[i].lpProtocol >= (char*)(buf) && pinfo[i].lpProtocol < (char*)(buf) + bufsize) if(pinfo[i].lpProtocol >= (char*)(lpProtocolBuffer) && pinfo[i].lpProtocol < (char*)(lpProtocolBuffer) + real_bufsize)
{ {
name_buf_size += strsize(pinfo[i].lpProtocol, unicode); name_buf_size += strsize(pinfo[i].lpProtocol, unicode);
} }
@ -206,9 +192,9 @@ static int do_EnumProtocols(LPINT protocols, LPVOID buf, LPDWORD bsptr, bool uni
return -1; return -1;
} }
for(int i = 0, off = 0; i < rval; ++i) for(int i = 0, off = 0; i < our_result; ++i)
{ {
if(pinfo[i].lpProtocol >= (char*)(buf) && pinfo[i].lpProtocol < (char*)(buf) + bufsize) if(pinfo[i].lpProtocol >= (char*)(lpProtocolBuffer) && pinfo[i].lpProtocol < (char*)(lpProtocolBuffer) + real_bufsize)
{ {
int len = strsize(pinfo[i].lpProtocol, unicode); int len = strsize(pinfo[i].lpProtocol, unicode);
@ -219,61 +205,61 @@ static int do_EnumProtocols(LPINT protocols, LPVOID buf, LPDWORD bsptr, bool uni
/* Calculate buffer offset so start adding names at. */ /* Calculate buffer offset so start adding names at. */
char *name_base = (char*)(buf) + sizeof(PROTOCOL_INFO) * (rval + !!want_ipx + !!want_spx + !!want_spxii); char *name_base = (char*)(lpProtocolBuffer) + sizeof(PROTOCOL_INFO) * (our_result + !!want_ipx + !!want_spx + !!want_spxii);
/* Append additional PROTOCOL_INFO structures and name strings. */ /* Append additional PROTOCOL_INFO structures and name strings. */
if(want_ipx) if(want_ipx)
{ {
pinfo[rval].dwServiceFlags = XP_CONNECTIONLESS | XP_MESSAGE_ORIENTED | XP_SUPPORTS_BROADCAST | XP_SUPPORTS_MULTICAST | XP_FRAGMENTATION; pinfo[our_result].dwServiceFlags = XP_CONNECTIONLESS | XP_MESSAGE_ORIENTED | XP_SUPPORTS_BROADCAST | XP_SUPPORTS_MULTICAST | XP_FRAGMENTATION;
pinfo[rval].iAddressFamily = AF_IPX; pinfo[our_result].iAddressFamily = AF_IPX;
pinfo[rval].iMaxSockAddr = 16; pinfo[our_result].iMaxSockAddr = 16;
pinfo[rval].iMinSockAddr = 14; pinfo[our_result].iMinSockAddr = 14;
pinfo[rval].iSocketType = SOCK_DGRAM; pinfo[our_result].iSocketType = SOCK_DGRAM;
pinfo[rval].iProtocol = NSPROTO_IPX; pinfo[our_result].iProtocol = NSPROTO_IPX;
pinfo[rval].dwMessageSize = 576; pinfo[our_result].dwMessageSize = 576;
pinfo[rval].lpProtocol = name_base; pinfo[our_result].lpProtocol = name_base;
PUSH_NAME("IPX"); PUSH_NAME("IPX");
++rval; ++our_result;
} }
if(want_spx) if(want_spx)
{ {
pinfo[rval].dwServiceFlags = XP_GUARANTEED_DELIVERY | XP_GUARANTEED_ORDER | XP_PSEUDO_STREAM | XP_FRAGMENTATION; pinfo[our_result].dwServiceFlags = XP_GUARANTEED_DELIVERY | XP_GUARANTEED_ORDER | XP_PSEUDO_STREAM | XP_FRAGMENTATION;
pinfo[rval].iAddressFamily = AF_IPX; pinfo[our_result].iAddressFamily = AF_IPX;
pinfo[rval].iMaxSockAddr = 16; pinfo[our_result].iMaxSockAddr = 16;
pinfo[rval].iMinSockAddr = 14; pinfo[our_result].iMinSockAddr = 14;
pinfo[rval].iSocketType = SOCK_STREAM; pinfo[our_result].iSocketType = SOCK_STREAM;
pinfo[rval].iProtocol = NSPROTO_SPX; pinfo[our_result].iProtocol = NSPROTO_SPX;
pinfo[rval].dwMessageSize = 0xFFFFFFFF; pinfo[our_result].dwMessageSize = 0xFFFFFFFF;
pinfo[rval].lpProtocol = name_base; pinfo[our_result].lpProtocol = name_base;
PUSH_NAME("SPX"); PUSH_NAME("SPX");
++rval; ++our_result;
} }
if(want_spxii) if(want_spxii)
{ {
pinfo[rval].dwServiceFlags = XP_GUARANTEED_DELIVERY | XP_GUARANTEED_ORDER | XP_PSEUDO_STREAM | XP_FRAGMENTATION; pinfo[our_result].dwServiceFlags = XP_GUARANTEED_DELIVERY | XP_GUARANTEED_ORDER | XP_PSEUDO_STREAM | XP_FRAGMENTATION;
pinfo[rval].iAddressFamily = AF_IPX; pinfo[our_result].iAddressFamily = AF_IPX;
pinfo[rval].iMaxSockAddr = 16; pinfo[our_result].iMaxSockAddr = 16;
pinfo[rval].iMinSockAddr = 14; pinfo[our_result].iMinSockAddr = 14;
pinfo[rval].iSocketType = SOCK_STREAM; pinfo[our_result].iSocketType = SOCK_STREAM;
pinfo[rval].iProtocol = NSPROTO_SPXII; pinfo[our_result].iProtocol = NSPROTO_SPXII;
pinfo[rval].dwMessageSize = 0xFFFFFFFF; pinfo[our_result].dwMessageSize = 0xFFFFFFFF;
pinfo[rval].lpProtocol = name_base; pinfo[our_result].lpProtocol = name_base;
PUSH_NAME("SPX II"); PUSH_NAME("SPX II");
++rval; ++our_result;
} }
/* Replace the names we pulled out of the buffer earlier. */ /* Replace the names we pulled out of the buffer earlier. */
for(int i = 0; i < rval; ++i) for(int i = 0; i < our_result; ++i)
{ {
if(pinfo[i].lpProtocol >= name_buf && pinfo[i].lpProtocol < name_buf + name_buf_size) if(pinfo[i].lpProtocol >= name_buf && pinfo[i].lpProtocol < name_buf + name_buf_size)
{ {
@ -286,22 +272,31 @@ static int do_EnumProtocols(LPINT protocols, LPVOID buf, LPDWORD bsptr, bool uni
free(name_buf); free(name_buf);
return rval; return our_result;
} }
INT APIENTRY EnumProtocolsA(LPINT protocols, LPVOID buf, LPDWORD bsptr) INT APIENTRY EnumProtocolsA(LPINT lpiProtocols, LPVOID lpProtocolBuffer, LPDWORD lpdwBufferLength)
{ {
return do_EnumProtocols(protocols, buf, bsptr, false); DWORD real_bufsize = *lpdwBufferLength;
int sys_result = r_EnumProtocolsA(lpiProtocols, lpProtocolBuffer, lpdwBufferLength);
return do_EnumProtocols(lpiProtocols, lpProtocolBuffer, lpdwBufferLength, false, sys_result, real_bufsize);
} }
INT APIENTRY EnumProtocolsW(LPINT protocols, LPVOID buf, LPDWORD bsptr) INT APIENTRY EnumProtocolsW(LPINT lpiProtocols, LPVOID lpProtocolBuffer, LPDWORD lpdwBufferLength)
{ {
return do_EnumProtocols(protocols, buf, bsptr, true); DWORD real_bufsize = *lpdwBufferLength;
int sys_result = r_EnumProtocolsW(lpiProtocols, lpProtocolBuffer, lpdwBufferLength);
return do_EnumProtocols(lpiProtocols, lpProtocolBuffer, lpdwBufferLength, true, sys_result, real_bufsize);
} }
INT WINAPI WSHEnumProtocols(LPINT protocols, LPWSTR ign, LPVOID buf, LPDWORD bsptr) INT WINAPI WSHEnumProtocols(LPINT lpiProtocols, LPWSTR lpTransportKeyName, LPVOID lpProtocolBuffer, LPDWORD lpdwBufferLength)
{ {
return do_EnumProtocols(protocols, buf, bsptr, false); DWORD real_bufsize = *lpdwBufferLength;
int sys_result = r_WSHEnumProtocols(lpiProtocols, lpTransportKeyName, lpProtocolBuffer, lpdwBufferLength);
return do_EnumProtocols(lpiProtocols, lpProtocolBuffer, lpdwBufferLength, false, sys_result, real_bufsize);
} }
static int recv_queue_adjust_refcount(ipx_recv_queue *recv_queue, int adj) static int recv_queue_adjust_refcount(ipx_recv_queue *recv_queue, int adj)