Changeset 26030 in vbox for trunk/src/VBox

Timestamp:

Jan 25, 2010 6:27:21 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56925

Message:

Main/Media: fix construction of CFGM tree when taking snapshots

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7577 +7577 @@
         for (size_t i = 0; i < names.size(); ++ i)
         {
-            if (values[i])
+            if (values[i] && *values[i])
             {
                 Utf8Str name = names[i];
@@ -7618 +7618 @@
             for (size_t i = 0; i < aNames.size(); ++ i)
             {
-                if (aValues[i])
+                if (aValues[i] && *aValues[i])
                 {
                     Utf8Str name = aNames[i];
                     Utf8Str value = aValues[i];
-                    rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());
+                    rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str()); RC_CHECK();
                     if (    !(name.compare("HostIPStack"))
                         &&  !(value.compare("0")))

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1152 +1152 @@
                                 Utf8Str name = names[ii];
                                 Utf8Str value = values[ii];
-                                rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str()); AssertRC(rc); /** @todo r=bird: why not RC_CHECK() here? (I added the AssertRC.)*/
+                                rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());     RC_CHECK();
                                 if (    name.compare("HostIPStack") == 0
                                     &&  value.compare("0") == 0)
@@ -1191 +1191 @@
                             for (size_t ii = 0; ii < aNames.size(); ++ii)
                             {
-                                if (aValues[ii])
+                                if (aValues[ii] && *aValues[ii])
                                 {
                                     Utf8Str name = aNames[ii];
                                     Utf8Str value = aValues[ii];
-                                    rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str()); AssertRC(rc); /** @todo r=bird: why not RC_HCECK here? (I added the AssertRC.)*/
+                                    rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str()); RC_CHECK();
                                     if (    name.compare("HostIPStack") == 0
                                         &&  value.compare("0") == 0)