Changeset 93377 in vbox for trunk

Timestamp:

Jan 20, 2022 6:35:17 PM (3 years ago)

Author:

vboxsync

Message:

Main/UnattendedImpl: ​​​bugref:10182. Returning string for VBOXOSTYPE_Unknown rather than empty string in case detection fails.

File:

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

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -392 +392 @@
     if (hrc == S_FALSE && enmOsType == VBOXOSTYPE_Unknown)
         hrc = i_innerDetectIsoOSOs2(hVfsIso, &uBuf, &enmOsType);
-    if (enmOsType != VBOXOSTYPE_Unknown)
-    {
-        try {  mStrDetectedOSTypeId = Global::OSTypeId(enmOsType); }
-        catch (std::bad_alloc &) { hrc = E_OUTOFMEMORY; }
-    }
+    try {  mStrDetectedOSTypeId = Global::OSTypeId(enmOsType); }
+    catch (std::bad_alloc &) { hrc = E_OUTOFMEMORY; }
     return hrc;
 }