Changeset 16209 in vbox

Timestamp:

Jan 23, 2009 6:48:23 PM (16 years ago)

Author:

vboxsync

Message:

OVF: fix ulong overflow

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -800 +800 @@
 }
 
-STDMETHODIMP Appliance::GetDisks (ComSafeArrayOut(BSTR, aDisks), ULONG *cDisks)
+STDMETHODIMP Appliance::GetDisks(ComSafeArrayOut(BSTR, aDisks), ULONG *cDisks)
 {
     CheckComArgOutSafeArrayPointerValid(aDisks);
@@ -852 +852 @@
 }
 
-STDMETHODIMP Appliance::COMGETTER (VirtualSystemDescriptions)(ComSafeArrayOut (IVirtualSystemDescription*, aVirtualSystemDescriptions))
+STDMETHODIMP Appliance::COMGETTER(VirtualSystemDescriptions)(ComSafeArrayOut(IVirtualSystemDescription*, aVirtualSystemDescriptions))
 {
     CheckComArgOutSafeArrayPointerValid (aVirtualSystemDescriptions);
@@ -979 +979 @@
     //  - don't use COM methods but the methods directly (faster, but needs appropriate locking of that objects itself (s. HardDisk2))
     //  - Appropriate handle errors like not supported file formats
-    //  - Maybe it is better to replace std::string with Utf8Str's on some places?
 
     /* Clear any previous virtual system descriptions */
@@ -1208 +1207 @@
 
         /* RAM */
-        ULONG memSizeVBox = vs.ullMemorySize; /** @todo r=bird/MSC: this will overflow at 4GB, use 64-bit type. */
+        uint64_t ullMemSizeVBox = vs.ullMemorySize; /** @todo r=bird/MSC: this will overflow at 4GB, use 64-bit type. */
         if (vs.ullMemorySize == 0)
         {
             /* If the RAM of the OVF is zero, use our predefined values */
-            rc = osType->COMGETTER(RecommendedRAM) (&memSizeVBox);
+            ULONG memSizeVBox2;
+            rc = osType->COMGETTER(RecommendedRAM)(&memSizeVBox2);
             ComAssertComRCThrowRC (rc);
             /* VBox stores that in MByte */
-            memSizeVBox *= _1M;
-        }
-        vsd->addEntry (VirtualSystemDescriptionType_Memory, 0, toString<ULONG> (vs.ullMemorySize), toString<ULONG> (memSizeVBox));
+            ullMemSizeVBox = memSizeVBox2 * _1M;
+        }
+        vsd->addEntry (VirtualSystemDescriptionType_Memory, 0, toString<uint64_t> (vs.ullMemorySize), toString<uint64_t> (ullMemSizeVBox));
 
         /* Hard disk Controller */