summaryrefslogtreecommitdiff
path: root/src/wasm-s-parser.h
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-03-28 18:26:24 -0700
committerAlon Zakai <alonzakai@gmail.com>2016-03-28 18:26:24 -0700
commitfb0d9509f23472df14d03d93d333d242d23bd2bd (patch)
tree40afeae744cd0355e27f18e45f2911c1d01c31f3 /src/wasm-s-parser.h
parent97972db66d30c1acb716e4f7a421f1fbe7410927 (diff)
parent5cc2c2182332cd17bf12e3cdb58e61d0582eafc1 (diff)
downloadbinaryen-fb0d9509f23472df14d03d93d333d242d23bd2bd.tar.gz
binaryen-fb0d9509f23472df14d03d93d333d242d23bd2bd.tar.bz2
binaryen-fb0d9509f23472df14d03d93d333d242d23bd2bd.zip
Merge pull request #287 from WebAssembly/vs2015_fixes
VS2015 fixes
Diffstat (limited to 'src/wasm-s-parser.h')
-rw-r--r--src/wasm-s-parser.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 965336857..575ceff97 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -23,6 +23,8 @@
#define wasm_wasm_s_parser_h
#include <cmath>
+#include <cctype>
+#include <limits>
#include "wasm.h"
#include "mixed_arena.h"
@@ -825,8 +827,8 @@ private:
ret->align = atoi(eq);
} else if (str[0] == 'o') {
uint64_t offset = atoll(eq);
- if (offset > 0xffffffff) onError();
- ret->offset = offset;
+ if (offset > std::numeric_limits<uint32_t>::max()) onError();
+ ret->offset = (uint32_t)offset;
} else onError();
i++;
}