Changeset 15658 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 18, 2008 1:58:53 PM (16 years ago)

Author:

vboxsync

Message:

#3282: More reliable /proc/net/if_inet6 handling.

File:

• trunk/src/VBox/Main/linux/NetIfList-linux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/linux/NetIfList-linux.cpp

@@ -39 +39 @@
 #include "HostNetworkInterfaceImpl.h"
 #include "netif.h"
+#include "Logging.h"
 
 int NetIfList(std::list <ComObjPtr <HostNetworkInterface> > &list)
@@ -86 +87 @@
                             unsigned uIndex, uLength, uScope, uTmp;
                             char szName[30];
-                            while (fscanf(fp,
-                                          "%08x%08x%08x%08x"
-                                          " %02x %02x %02x %02x %20s\n",
-                                          &IPv6Address.au32[0], &IPv6Address.au32[1],
-                                          &IPv6Address.au32[2], &IPv6Address.au32[3],
-                                          &uIndex, &uLength, &uScope, &uTmp, szName) != EOF)
+                            for (;;)
                             {
+                                memset(szName, 0, sizeof(szName));
+                                int n = fscanf(fp,
+                                               "%08x%08x%08x%08x"
+                                               " %02x %02x %02x %02x %20s\n",
+                                               &IPv6Address.au32[0], &IPv6Address.au32[1],
+                                               &IPv6Address.au32[2], &IPv6Address.au32[3],
+                                               &uIndex, &uLength, &uScope, &uTmp, szName);
+                                if (n == EOF)
+                                    break;
+                                if (n != 9 || uLength > 128)
+                                {
+                                    Log(("NetIfList: Error while reading /proc/net/if_inet6, n=%d uLength=%u\n",
+                                         n, uLength));
+                                    break;
+                                }
                                 if (!strcmp(pReq->ifr_name, szName))
                                 {