Changeset 22567 in vbox

Timestamp:

Aug 28, 2009 7:55:30 PM (15 years ago)

Author:

vboxsync

Message:

Main/GuestProperties: fix r51587

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2844 +2844 @@
             std::vector<const char *> names, values, flags;
             std::vector<ULONG64> timestamps;
-            for (unsigned i = 0; i < cProps; ++i)
+            for (unsigned i = 0; i < cProps && RT_SUCCESS(rc); ++i)
             {
                 AssertPtrReturn(namesOut[i], VERR_INVALID_PARAMETER);
                 utf8Names.push_back(Bstr(namesOut[i]));
-                names.push_back(utf8Names.back().c_str());
+                utf8Values.push_back(Bstr(valuesOut[i]));
+                timestamps.push_back(timestampsOut[i]);
+                utf8Flags.push_back(Bstr(flagsOut[i]));
+            }
+            for (unsigned i = 0; i < cProps && RT_SUCCESS(rc); ++i)
+            {
+                names.push_back(utf8Names[i].c_str());
                 AssertPtrReturn(names[i], VERR_NO_MEMORY);
                 if (valuesOut[i])
-                {
-                    utf8Values.push_back(Bstr(valuesOut[i]));
-                    values.push_back(utf8Values.back().c_str());
-                }
+                    values.push_back(utf8Values[i].c_str());
                 else
                     values.push_back("");
                 AssertPtrReturn(values[i], VERR_NO_MEMORY);
-                timestamps.push_back(timestampsOut[i]);
                 if (flagsOut[i])
-                {
-                    utf8Flags.push_back(Bstr(flagsOut[i]));
-                    flags.push_back(utf8Flags.back().c_str());
-                }
+                    flags.push_back(utf8Flags[i].c_str());
                 else
                     flags.push_back("");