mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26650) -Fix [FS#6041]: Support save/load chunk lengths of up to (1 << 32) - 1

release/1.5
fonsinchen 2014-06-17 06:13:38 +00:00
parent d8437525da
commit 37b1d36fb8
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/saveload/saveload.cpp
View File

@ -675,7 +675,11 @@ static uint SlReadSimpleGamma()
if (HasBit(i, 5)) { if (HasBit(i, 5)) {
i &= ~0x20; i &= ~0x20;
if (HasBit(i, 4)) { if (HasBit(i, 4)) {
SlErrorCorrupt("Unsupported gamma"); i &= ~0x10;
if (HasBit(i, 3)) {
SlErrorCorrupt("Unsupported gamma");
}
i = SlReadByte(); // 32 bits only.
} }
i = (i << 8) | SlReadByte(); i = (i << 8) | SlReadByte();
} }
@ -695,6 +699,11 @@ static uint SlReadSimpleGamma()
* 10xxxxxx xxxxxxxx * 10xxxxxx xxxxxxxx
* 110xxxxx xxxxxxxx xxxxxxxx * 110xxxxx xxxxxxxx xxxxxxxx
* 1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx * 1110xxxx xxxxxxxx xxxxxxxx xxxxxxxx
* 11110--- xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
* We could extend the scheme ad infinum to support arbitrarily
* large chunks, but as sizeof(size_t) == 4 is still very common
* we don't support anything above 32 bits. That's why in the last
* case the 3 most significant bits are unused.
* @param i Index being written * @param i Index being written
*/ */
@ -703,8 +712,13 @@ static void SlWriteSimpleGamma(size_t i)
if (i >= (1 << 7)) { if (i >= (1 << 7)) {
if (i >= (1 << 14)) { if (i >= (1 << 14)) {
if (i >= (1 << 21)) { if (i >= (1 << 21)) {
assert(i < (1 << 28)); if (i >= (1 << 28)) {
SlWriteByte((byte)(0xE0 | (i >> 24))); assert(i <= UINT32_MAX); // We can only support 32 bits for now.
SlWriteByte((byte)(0xF0));
SlWriteByte((byte)(i >> 24));
} else {
SlWriteByte((byte)(0xE0 | (i >> 24)));
}
SlWriteByte((byte)(i >> 16)); SlWriteByte((byte)(i >> 16));
} else { } else {
SlWriteByte((byte)(0xC0 | (i >> 16))); SlWriteByte((byte)(0xC0 | (i >> 16)));
@ -720,7 +734,7 @@ static void SlWriteSimpleGamma(size_t i)
/** Return how many bytes used to encode a gamma value */ /** Return how many bytes used to encode a gamma value */
static inline uint SlGetGammaLength(size_t i) static inline uint SlGetGammaLength(size_t i)
{ {
return 1 + (i >= (1 << 7)) + (i >= (1 << 14)) + (i >= (1 << 21)); return 1 + (i >= (1 << 7)) + (i >= (1 << 14)) + (i >= (1 << 21)) + (i >= (1 << 28));
} }
static inline uint SlReadSparseIndex() static inline uint SlReadSparseIndex()