Changeset 60391 in vbox for trunk/src/VBox

Timestamp:

Apr 8, 2016 9:29:58 AM (9 years ago)

Author:

vboxsync

Message:

GuestControl/service.cpp: Follow-up for r106475 (bugref:7179): Explicitly handle std::bad_alloc, destroy service object if constructor has thrown, touched copyright.

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2014 Oracle Corporation
+ * Copyright (C) 2011-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1611 +1611 @@
         else
         {
-            Service *apService = NULL;
+            Service *pService = NULL;
             /* No exceptions may propagate outside. */
-            try {
-                apService = new Service(pTable->pHelpers);
-            } catch (int rcThrown) {
+            try
+            {
+                pService = new Service(pTable->pHelpers);
+            }
+            catch (int rcThrown)
+            {
                 rc = rcThrown;
-            } catch (...) {
-                rc = VERR_UNRESOLVED_ERROR;
+            }
+            catch(std::bad_alloc &)
+            {
+                rc = VERR_NO_MEMORY;
             }
 
@@ -1640 +1645 @@
 
                 /* Service specific initialization. */
-                pTable->pvService = apService;
+                pTable->pvService = pService;
+            }
+            else
+            {
+                if (pService)
+                {
+                    delete pService;
+                    pService = NULL;
+                }
             }
         }