Runtime

Timestamp:

Feb 15, 2012 4:24:51 PM (13 years ago)

Author:

vboxsync

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

76288

Message:

Runtime/Dvm: Use uint64_t instead of size_t for the number of intersecting bytes because size_t is only 32bits wide on 32bit hosts and the value can exceed the range

Location:

trunk/src/VBox/Runtime

Files:

: 5 edited

common/dvm/dvm.cpp (modified) (1 diff)
common/dvm/dvmbsdlabel.cpp (modified) (2 diffs)
common/dvm/dvmgpt.cpp (modified) (1 diff)
common/dvm/dvmmbr.cpp (modified) (1 diff)
include/internal/dvm.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/Runtime/common/dvm/dvm.cpp

r40027	r40137
483	483	PRTDVMVOLUMEINTERNAL pVol;
484	484	bool fVolFound = false;
485		~~size~~_t cbIntersect;
	485	uint64_t cbIntersect;
486	486	uint64_t offVol;
487	487

trunk/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp

-              r40085
+              r40137
         pVol->pBsdPartitionEntry = pBsdPartitionEntry;
         pVol->offStart           = (uint64_t)pBsdPartitionEntry->offSectorStart * pThis->DiskLabel.cbSector;
         pVol->cbVolume           = pBsdPartitionEntry->cSectors * pThis->DiskLabel.cbSector;
+        pVol->cbVolume           = (uint64_t)pBsdPartitionEntry->cSectors * pThis->DiskLabel.cbSector;
         *phVolFmt = pVol;
 …
                                                            uint64_t offStart, size_t cbRange,
                                                            uint64_t *poffVol,
                                                            size_t *pcbIntersect)
+                                                           uint64_t *pcbIntersect)
+{
     bool fIntersect = false;

trunk/src/VBox/Runtime/common/dvm/dvmgpt.cpp

r40027	r40137
487	487	uint64_t offStart, size_t cbRange,
488	488	uint64_t *poffVol,
489		~~size~~_t *pcbIntersect)
	489	uint64_t *pcbIntersect)
490	490	{
491	491	bool fIntersect = false;

trunk/src/VBox/Runtime/common/dvm/dvmmbr.cpp

r40027	r40137
356	356	uint64_t offStart, size_t cbRange,
357	357	uint64_t *poffVol,
358		~~size~~_t *pcbIntersect)
	358	uint64_t *pcbIntersect)
359	359	{
360	360	bool fIntersect = false;

trunk/src/VBox/Runtime/include/internal/dvm.h

r40028	r40137
215	215	uint64_t offStart, size_t cbRange,
216	216	uint64_t *poffVol,
217		~~size~~_t *pcbIntersect);
	217	uint64_t *pcbIntersect);
218	218
219	219	/**

Note: See TracChangeset for help on using the changeset viewer.