summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorfonsinchen <fonsinchen@openttd.org>2014-06-17 06:13:38 +0000
committerfonsinchen <fonsinchen@openttd.org>2014-06-17 06:13:38 +0000
commit37b1d36fb89b11b1bf0d5547fcebc542596e4e20 (patch)
tree320e76afe89ab7bcc1f6ffed62724c9648c4b1fb /src/saveload
parentd8437525dad32bceda38311031094878896442eb (diff)
downloadopenttd-37b1d36fb89b11b1bf0d5547fcebc542596e4e20.tar.xz
(svn r26650) -Fix [FS#6041]: Support save/load chunk lengths of up to (1 << 32) - 1
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/saveload.cpp22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 958ed46ac..ed97e6411 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -675,7 +675,11 @@ static uint SlReadSimpleGamma()
if (HasBit(i, 5)) {
i &= ~0x20;
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();
}
@@ -695,6 +699,11 @@ static uint SlReadSimpleGamma()
* 10xxxxxx xxxxxxxx
* 110xxxxx 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
*/
@@ -703,8 +712,13 @@ static void SlWriteSimpleGamma(size_t i)
if (i >= (1 << 7)) {
if (i >= (1 << 14)) {
if (i >= (1 << 21)) {
- assert(i < (1 << 28));
- SlWriteByte((byte)(0xE0 | (i >> 24)));
+ if (i >= (1 << 28)) {
+ 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));
} else {
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 */
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()