儲存庫 vbox 的更動 77232

時間撮記:

2019-2-9 上午01:55:37 (6 年 以前)

作者:

vboxsync

訊息:

Storage/QED+QCOW: It is not allowed to mix RTStrDup, RTMemAlloc and RTStrFree, you must stick to one allocator type. Strings must be sanitized or coverted after loading.

位置:

trunk/src/VBox/Storage

檔案:

• QCOW.cpp (修改) (3 筆差異)
• QED.cpp (修改) (4 筆差異)
• testcase/VDIoBackend.cpp (修改) (1 筆差異)
• testcase/VDIoBackendMem.cpp (修改) (1 筆差異)
• testcase/VDMemDisk.cpp (修改) (1 筆差異)
• testcase/VDScript.cpp (修改) (1 筆差異)
• testcase/VDScriptAst.cpp (修改) (1 筆差異)
• testcase/VDScriptChecker.cpp (修改) (1 筆差異)
• testcase/VDScriptInterp.cpp (修改) (1 筆差異)
• testcase/tstVDIo.cpp (修改) (2 筆差異)
• testcase/tstVDSnap.cpp (修改) (1 筆差異)

trunk/src/VBox/Storage/QCOW.cpp

@@ -974 +974 @@
         if (pImage->pszBackingFilename)
         {
-            RTMemFree(pImage->pszBackingFilename);
+            RTStrFree(pImage->pszBackingFilename);
             pImage->pszBackingFilename = NULL;
         }
@@ -1153 +1153 @@
                     {
                         /* Load backing filename from image. */
-                        pImage->pszBackingFilename = (char *)RTMemAllocZ(pImage->cbBackingFilename + 1); /* +1 for \0 terminator. */
+                        pImage->pszBackingFilename = RTStrAlloc(pImage->cbBackingFilename + 1); /* +1 for \0 terminator. */
                         if (pImage->pszBackingFilename)
                         {
+                            RT_BZERO(pImage->pszBackingFilename, pImage->cbBackingFilename + 1);
                             rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage,
                                                        pImage->offBackingFilename, pImage->pszBackingFilename,
                                                        pImage->cbBackingFilename);
+                            if (RT_SUCCESS(rc))
+                                rc = RTStrValidateEncoding(pImage->pszBackingFilename);
                         }
                         else
-                            rc = VERR_NO_MEMORY;
+                            rc = VERR_NO_STR_MEMORY;
                     }
 
@@ -2197 +2200 @@
             pImage->pszBackingFilename = RTStrDup(pszParentFilename);
             if (!pImage->pszBackingFilename)
-                rc = VERR_NO_MEMORY;
+                rc = VERR_NO_STR_MEMORY;
             else
             {

trunk/src/VBox/Storage/QED.cpp

@@ -1107 +1107 @@
         if (pImage->pszBackingFilename)
         {
-            RTMemFree(pImage->pszBackingFilename);
+            RTStrFree(pImage->pszBackingFilename);
             pImage->pszBackingFilename = NULL;
         }
@@ -1175 +1175 @@
                         {
                             /* Load backing filename from image. */
-                            pImage->pszBackingFilename = (char *)RTMemAllocZ(Header.u32BackingFilenameSize + 1); /* +1 for \0 terminator. */
+                            pImage->pszBackingFilename = RTStrAlloc(Header.u32BackingFilenameSize + 1); /* +1 for \0 terminator. */
                             if (pImage->pszBackingFilename)
                             {
+                                RT_BZERO(pImage->pszBackingFilename, Header.u32BackingFilenameSize + 1);
                                 pImage->cbBackingFilename  = Header.u32BackingFilenameSize;
                                 pImage->offBackingFilename = Header.u32OffBackingFilename;
@@ -1183 +1184 @@
                                                            Header.u32OffBackingFilename, pImage->pszBackingFilename,
                                                            Header.u32BackingFilenameSize);
+                                if (RT_SUCCESS(rc))
+                                    rc = RTStrValidateEncoding(pImage->pszBackingFilename);
                             }
                             else
-                                rc = VERR_NO_MEMORY;
+                                rc = VERR_NO_STR_MEMORY;
                         }
 
@@ -2203 +2206 @@
         pImage->pszBackingFilename = RTStrDup(pszParentFilename);
         if (!pImage->pszBackingFilename)
-            rc = VERR_NO_MEMORY;
+            rc = VERR_NO_STR_MEMORY;
         else
         {

trunk/src/VBox/Storage/testcase/VDIoBackend.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
- *
  * VBox HDD container test utility, I/O backend API
  */

trunk/src/VBox/Storage/testcase/VDIoBackendMem.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
- *
  * VBox HDD container test utility, async I/O memory backend
  */

trunk/src/VBox/Storage/testcase/VDMemDisk.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
- *
  * VBox HDD container test utility, memory disk/file.
  */

trunk/src/VBox/Storage/testcase/VDScript.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
  * VBox HDD container test utility - scripting engine.

trunk/src/VBox/Storage/testcase/VDScriptAst.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
- *
  * VBox HDD container test utility - scripting engine AST node related functions.
  */

trunk/src/VBox/Storage/testcase/VDScriptChecker.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
  * VBox HDD container test utility - scripting engine, type and context checker.

trunk/src/VBox/Storage/testcase/VDScriptInterp.cpp

@@ -1 @@
-/** $Id$ */
+/* $Id$ */
 /** @file
  * VBox HDD container test utility - scripting engine, interpreter.

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * VBox HDD container test utility - I/O replay.
  */
@@ -16 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #define LOGGROUP LOGGROUP_DEFAULT
 #include <VBox/vd.h>

trunk/src/VBox/Storage/testcase/tstVDSnap.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * Snapshot VBox HDD container test utility.
  */