[PATCH v3 1/2] nsiproxy: Only set the connection count from tcp_conns_enumerate_all when appropriate.

[Tim Clem]

From: Tim Clem

Fixes heap corruption downstream in NsiEnumerateObjectsAllParametersEx.

Fixes a regression from 9085bc7b87f.
---
 dlls/nsiproxy.sys/tcp.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c
index 7a3004b1a97..e472d8600a2 100644
--- a/dlls/nsiproxy.sys/tcp.c
+++ b/dlls/nsiproxy.sys/tcp.c
@@ -322,13 +322,17 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k
             *count = reply->count;
         else if (ret == STATUS_BUFFER_TOO_SMALL)
         {
-            *count = reply->count;
-            if (want_data)
+            if (!want_data)
             {
-                free( connections );
-                return STATUS_BUFFER_OVERFLOW;
+                /* If we were given buffers, the outgoing count must never be
+                   greater than the incoming one. If we weren't, the count
+                   should be set to the actual count. */
+                *count = reply->count;
+                return STATUS_SUCCESS;
             }
-            return STATUS_SUCCESS;
+
+            free( connections );
+            return STATUS_BUFFER_OVERFLOW;
         }
     }
     SERVER_END_REQ;