Changeset 15109 in vbox

Timestamp:

Dec 8, 2008 1:55:37 PM (16 years ago)

Author:

vboxsync

Message:

Main/HardDisk2Impl: copy zero terminator too. Also deal correctly with NULL values on VM start in ConsoleImpl.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• HardDisk2Impl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -853 +853 @@
                 for (size_t i = 0; i < names.size(); ++ i)
                 {
-                    rc = CFGMR3InsertString (pVDC, Utf8Str (names [i]),
-                                             Utf8Str (values [i]));             RC_CHECK();
+                    if (values [i])
+                        rc = CFGMR3InsertString (pVDC, Utf8Str (names [i]),
+                                                 Utf8Str (values [i]));             RC_CHECK();
                 }
             }

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -3135 +3135 @@
         return VERR_CFGM_VALUE_NOT_FOUND;
 
-    memcpy (pszValue, value, value.length());
+    memcpy (pszValue, value, value.length() + 1);
 
     return VINF_SUCCESS;