Changeset 93458 in vbox for trunk/src/VBox

Timestamp:

Jan 27, 2022 12:19:49 PM (3 years ago)

Author:

vboxsync

Message:

Reverting r149466: 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

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