Changeset 35721 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Jan 26, 2011 10:47:26 AM (14 years ago)

Author:

vboxsync

Message:

ExtPackManagerImpl.cpp: Fixed crash during installation because refreshExtPack returned a NULL pointer.

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -2409 +2409 @@
  * to the extension pack object may become invalid.
  *
- * @returns S_OK and *ppExtPack on success, COM status code and error message
- *          on failure.
+ * @returns S_OK and *a_ppExtPack on success, COM status code and error
+ *          message on failure.  Note that *a_ppExtPack can be NULL.
  *
  * @param   a_pszName           The extension to update..
@@ -2607 +2607 @@
             {
                 hrc = refreshExtPack(pStrName->c_str(), true /*a_fUnusableIsError*/, &pExtPack);
-                if (SUCCEEDED(hrc))
+                if (SUCCEEDED(hrc) && pExtPack)
                 {
                     RTERRINFOSTATIC ErrInfo;
@@ -2633 +2633 @@
                     }
                 }
+                else if (SUCCEEDED(hrc))
+                    hrc = setError(E_FAIL, tr("Installing extension pack '%s' failed under mysterious circumstances"),
+                                   pStrName->c_str());
             }
             else