Chameleon Commit Details - 136 - Chameleon open source boot loader project.

Date:

2010-03-21 13:22:00 (14 years 4 months ago)

Author:

Tamás Kosárszky

Commit:

136

Parents:

135

Message:

Applied MacWen's "header read size 0" fix.

Changes:

M	/trunk/i386/libsaio/hfs.c

File differences

-887
888 888
889 889
890 
890
891
891 892
892 893
893 894
+        readOffset = ((blockNumber - countedBlocks) * gBlockSize) +␊
                     (offset % gBlockSize);␊
    ␊
        readSize = GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;␊
␉␉// MacWen: fix overflow in multiplication by forcing 64bit multiplication␊
        readSize = (long long)GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;␊
        if (readSize > (size - sizeRead)) readSize = size - sizeRead;␊
␊
        readOffset += (long long)GetExtentStart(currentExtent, 0) * gBlockSize;␊
         readOffset = ((blockNumber - countedBlocks) * gBlockSize) +␊
                      (offset % gBlockSize);␊
     ␊
-        readSize = GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;␊
+␉␉// MacWen: fix overflow in multiplication by forcing 64bit multiplication␊
+        readSize = (long long)GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;␊
         if (readSize > (size - sizeRead)) readSize = size - sizeRead;␊
 ␊
         readOffset += (long long)GetExtentStart(currentExtent, 0) * gBlockSize;␊