Networking/VBoxNetSlirpNAT: Fixed a memory leak occurring on every start; renamed variables to emphasize that these are class members and in fact in use.

svn:sync-xref-src-repo-rev: r173858

Author: alflr

src/VBox/NetworkServices/NAT/VBoxNetSlirpNAT.cpp

@@ -1,4 +1,4 @@
-/* $Id: VBoxNetSlirpNAT.cpp 114049 2026-04-30 08:22:00Z andreas.loeffler@oracle.com $ */
+/* $Id: VBoxNetSlirpNAT.cpp 114053 2026-04-30 10:34:45Z andreas.loeffler@oracle.com $ */
 /** @file
  * VBoxNetNAT - NAT Service for connecting to IntNet.
  */
@@ -189,10 +189,11 @@ class VBoxNetSlirpNAT
     unsigned int nsock;
 
     Slirp *m_pSlirp;
-    struct pollfd *polls;
 
-    /** Num Polls (not bytes) */
-    unsigned int uPollCap = 0;
+    /** Array of poll descriptors. */
+    struct pollfd *m_paPollFd;
+    /** Number of poll descriptors in m_paPollFd. */
+    unsigned int m_cPollFd = 0;
 
     /** List of timers (in reverse creation order).
      * @note There is currently only one libslirp timer (v4.8 / 2025-01-16).  */
@@ -336,6 +337,11 @@ VBoxNetSlirpNAT::VBoxNetSlirpNAT()
     pTimerHead = NULL;
     nsock      = 0;
 
+    m_cPollFd   = 64;
+    m_paPollFd  = (struct pollfd *)RTMemAllocZ(m_cPollFd * sizeof(struct pollfd));
+    if (!m_paPollFd)
+        throw VERR_NO_MEMORY;
+
     m_MacAddress.au8[0] = 0x52;
     m_MacAddress.au8[1] = 0x54;
     m_MacAddress.au8[2] = 0;
@@ -357,6 +363,10 @@ VBoxNetSlirpNAT::~VBoxNetSlirpNAT()
         RTMemFree(m_ProxyOptions.outbound_addr);
         m_ProxyOptions.outbound_addr = NULL;
     }
+
+    RTMemFree(m_paPollFd);
+    m_paPollFd = NULL;
+    m_cPollFd  = 0;
 }
 
 
@@ -2115,24 +2125,24 @@ void VBoxNetSlirpNAT::slirpNotifyPollThread(const char *pszWho)
 {
     VBoxNetSlirpNAT *pThis = static_cast<VBoxNetSlirpNAT *>(opaque);
 
-    if (pThis->nsock + 1 >= pThis->uPollCap)
+    if (pThis->nsock + 1 >= pThis->m_cPollFd)
     {
-        size_t cbNew = pThis->uPollCap * 2 * sizeof(struct pollfd);
-        struct pollfd *pvNew = (struct pollfd *)RTMemRealloc(pThis->polls, cbNew);
+        size_t cbNew = pThis->m_cPollFd * 2 * sizeof(struct pollfd);
+        struct pollfd *pvNew = (struct pollfd *)RTMemRealloc(pThis->m_paPollFd, cbNew);
         if (pvNew)
         {
-            pThis->polls = pvNew;
-            pThis->uPollCap *= 2;
+            pThis->m_paPollFd = pvNew;
+            pThis->m_cPollFd *= 2;
         }
         else
             return -1;
     }
 
     unsigned int uIdx = pThis->nsock;
     Assert(uIdx < INT_MAX);
-    pThis->polls[uIdx].fd = hFd;
-    pThis->polls[uIdx].events = pollEventSlirpToHost(iEvents);
-    pThis->polls[uIdx].revents = 0;
+    pThis->m_paPollFd[uIdx].fd = hFd;
+    pThis->m_paPollFd[uIdx].events = pollEventSlirpToHost(iEvents);
+    pThis->m_paPollFd[uIdx].revents = 0;
     pThis->nsock += 1;
     return uIdx;
 }
@@ -2150,7 +2160,7 @@ void VBoxNetSlirpNAT::slirpNotifyPollThread(const char *pszWho)
 /*static*/ int VBoxNetSlirpNAT::slirpGetREventsCb(int idx, void *opaque) RT_NOTHROW_DEF
 {
     VBoxNetSlirpNAT *pThis = static_cast<VBoxNetSlirpNAT *>(opaque);
-    struct pollfd* polls = pThis->polls;
+    struct pollfd* polls = pThis->m_paPollFd;
     return pollEventHostToSlirp(polls[idx].revents);
 }
 
@@ -2239,9 +2249,9 @@ VBoxNetSlirpNAT::pollThread(RTTHREAD hThreadSelf, void *pvUser)
     RTHCINTPTR const i64NativeReadPipe = RTPipeToNative(pThis->m_hPipeRead);
     int const        fdNativeReadPipe  = (int)i64NativeReadPipe;
     Assert(fdNativeReadPipe == i64NativeReadPipe); Assert(fdNativeReadPipe >= 0);
-    pThis->polls[0].fd = fdNativeReadPipe;
-    pThis->polls[0].events = POLLRDNORM | POLLPRI | POLLRDBAND;
-    pThis->polls[0].revents = 0;
+    pThis->m_paPollFd[0].fd = fdNativeReadPipe;
+    pThis->m_paPollFd[0].events = POLLRDNORM | POLLPRI | POLLRDBAND;
+    pThis->m_paPollFd[0].revents = 0;
 #endif /* !RT_OS_WINDOWS */
 
     /*
@@ -2259,9 +2269,9 @@ VBoxNetSlirpNAT::pollThread(RTTHREAD hThreadSelf, void *pvUser)
         cMsTimeout = pThis->slirpTimersAdjustTimeoutDown(cMsTimeout);
 
 #ifdef RT_OS_WINDOWS
-        int cChangedFDs = WSAPoll(pThis->polls, pThis->nsock, cMsTimeout);
+        int cChangedFDs = WSAPoll(pThis->m_paPollFd, pThis->nsock, cMsTimeout);
 #else
-        int cChangedFDs = poll(pThis->polls, pThis->nsock, cMsTimeout);
+        int cChangedFDs = poll(pThis->m_paPollFd, pThis->nsock, cMsTimeout);
 #endif
         if (cChangedFDs < 0)
         {
@@ -2290,7 +2300,7 @@ VBoxNetSlirpNAT::pollThread(RTTHREAD hThreadSelf, void *pvUser)
         /*
          * Drain the control pipe if necessary.
          */
-        if (pThis->polls[0].revents & (POLLIN|POLLRDNORM|POLLPRI|POLLRDBAND))   /* POLLPRI won't be seen with WSAPoll. */
+        if (pThis->m_paPollFd[0].revents & (POLLIN|POLLRDNORM|POLLPRI|POLLRDBAND))   /* POLLPRI won't be seen with WSAPoll. */
         {
             char achBuf[1024];
             size_t cbRead;