Skip to content

W
wine-cw
Commit 182ec0a5 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

wsock32: Check return value rather than returned size for error.

parent 2593ee87
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 15 deletions
dlls/wsock32/socket.c
View file @ 182ec0a5
......@@ -441,11 +441,9 @@ DWORD WINAPI WsControl(DWORD protocol,
if (!pcbResponseInfoLen)
return ERROR_BAD_ENVIRONMENT;
GetIpForwardTable(NULL, &routeTableSize, FALSE);
if (!routeTableSize) {
*pcbResponseInfoLen = 0;
return WSCTL_SUCCESS;
}
ret = GetIpForwardTable(NULL, &routeTableSize, FALSE);
if (ret != ERROR_INSUFFICIENT_BUFFER)
return ret;
numRoutes = (routeTableSize - sizeof(MIB_IPFORWARDTABLE))
/ sizeof(MIB_IPFORWARDROW) + 1;
if (*pcbResponseInfoLen < sizeof(IPRouteEntry) * numRoutes)
......@@ -494,11 +492,9 @@ DWORD WINAPI WsControl(DWORD protocol,
if (!pcbResponseInfoLen)
return ERROR_BAD_ENVIRONMENT;
GetIpNetTable(NULL, &arpTableSize, FALSE);
if (!arpTableSize) {
*pcbResponseInfoLen = 0;
return WSCTL_SUCCESS;
}
ret = GetIpNetTable(NULL, &arpTableSize, FALSE);
if (ret != ERROR_INSUFFICIENT_BUFFER)
return ret;
numEntries = (arpTableSize - sizeof(MIB_IPNETTABLE))
/ sizeof(MIB_IPNETROW) + 1;
if (*pcbResponseInfoLen < sizeof(MIB_IPNETROW) * numEntries)
......@@ -536,11 +532,9 @@ DWORD WINAPI WsControl(DWORD protocol,
if (!pcbResponseInfoLen)
return ERROR_BAD_ENVIRONMENT;
GetTcpTable(NULL, &tcpTableSize, FALSE);
if (!tcpTableSize) {
*pcbResponseInfoLen = 0;
return WSCTL_SUCCESS;
}
ret = GetTcpTable(NULL, &tcpTableSize, FALSE);
if (ret != ERROR_INSUFFICIENT_BUFFER)
return ret;
numEntries = (tcpTableSize - sizeof(MIB_TCPTABLE))
/ sizeof(MIB_TCPROW) + 1;
if (*pcbResponseInfoLen < sizeof(MIB_TCPROW) * numEntries)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment