Changeset 77622 in vbox for trunk/src

Timestamp:

Mar 8, 2019 3:37:25 PM (6 years ago)

Author:

vboxsync

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

129250

Message:

Bug fix/ syntax cleanup of AllocationBlockSize / createmedium property creation code

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (3 diffs)
• Storage/VDI.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -1 @@
-#include <signal.h>
 /* $Id$ */
 /** @file
@@ -51 +50 @@
     MEDIUMCATEGORY_FLOPPY
 } MEDIUMCATEGORY;
+
+
 
 // funcs
@@ -478 +479 @@
     {
         if (pMediumProps)
-            for (PMEDIUMPROPERTY pProp = pMediumProps; pProp; pProp = pProp->next)
+            for (PMEDIUMPROPERTY pProp = pMediumProps; pProp;)
+            {
                 CHECK_ERROR(pMedium, SetProperty(Bstr(pProp->key).raw(), Bstr(pProp->value).raw()));
+                PMEDIUMPROPERTY next = pProp->next;
+                RTMemFree(pProp);
+                pProp = next;
+            }
         }
 

trunk/src/VBox/Storage/VDI.cpp

@@ -42 +42 @@
 static const char *vdiAllocationBlockSize = "1048576";
 
-static const VDCONFIGINFO vdiConfigInfo[] = {
-    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      0 }
+static const VDCONFIGINFO vdiConfigInfo[] =
+{
+    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      0 },
+    { NULL,                             NULL,                             VDCFGVALUETYPE_INTEGER,      0 }
 };
 
@@ -719 +721 @@
 
     PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(pImage->pVDIfsImage);
-    if (pImgCfg) {
+    if (pImgCfg)
+    {
         rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize", &cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
         if (RT_FAILURE(rc))