Marcus Meissner : iphlpapi: Allocate space enough to handle all the possible ipv4 addresses.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jan 30 12:44:58 CST 2006


Module: wine
Branch: refs/heads/master
Commit: b970b2203725f52eeb1cf0374a482a931d275d84
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=b970b2203725f52eeb1cf0374a482a931d275d84

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Mon Jan 30 18:16:22 2006 +0100

iphlpapi: Allocate space enough to handle all the possible ipv4 addresses.

---

 dlls/iphlpapi/iphlpapi_main.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 1759c1e..063e9f7 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -654,9 +654,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER
        * precisely enough space.
        */
       size = sizeof(IP_ADAPTER_INFO) * numNonLoopbackInterfaces;
-      if (numIPAddresses > numNonLoopbackInterfaces)
-        size += (numIPAddresses - numNonLoopbackInterfaces) *
-         sizeof(IP_ADDR_STRING); 
+      size += numIPAddresses  * sizeof(IP_ADDR_STRING); 
       if (!pAdapterInfo || *pOutBufLen < size) {
         *pOutBufLen = size;
         ret = ERROR_BUFFER_OVERFLOW;
@@ -670,9 +668,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER
           table = getNonLoopbackInterfaceIndexTable();
         if (table) {
           size = sizeof(IP_ADAPTER_INFO) * table->numIndexes;
-          if (ipAddrTable->dwNumEntries > numNonLoopbackInterfaces)
-            size += (ipAddrTable->dwNumEntries - numNonLoopbackInterfaces) *
-             sizeof(IP_ADDR_STRING); 
+          size += ipAddrTable->dwNumEntries * sizeof(IP_ADDR_STRING); 
           if (*pOutBufLen < size) {
             *pOutBufLen = size;
             ret = ERROR_INSUFFICIENT_BUFFER;




More information about the wine-cvs mailing list