Changeset 39429 in vbox for trunk/src/VBox/Main/src-server/generic

Timestamp:

Nov 28, 2011 6:22:46 AM (13 years ago)

Author:

vboxsync

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

75059

Message:

Main/NetIf: Fixed segmentation fault in VBoxSVC on host-creation failure

File:

• trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -205 +205 @@
                         RTMemFree(pInfo);
                     }
+                    if ((rc = pclose(fp)) != 0)
+                    {
+                        progress->notifyComplete(E_FAIL,
+                                                 COM_IIDOF(IHostNetworkInterface),
+                                                 HostNetworkInterface::getStaticComponentName(),
+                                                 "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
+                        rc = VERR_INTERNAL_ERROR;
+                    }
                 }
-                if ((rc = pclose(fp)) != 0)
+                else
                 {
+                    /* Failed to add an interface */
+                    rc = VERR_PERMISSION_DENIED;
                     progress->notifyComplete(E_FAIL,
                                              COM_IIDOF(IHostNetworkInterface),
                                              HostNetworkInterface::getStaticComponentName(),
-                                             "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
-                    rc = VERR_INTERNAL_ERROR;
+                                             "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc);
+                    pclose(fp);
                 }
             }
             if (RT_SUCCESS(rc))
                 progress->notifyComplete(rc);
+            else
+                hrc = E_FAIL;
         }
     }