summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-02-09 15:42:59 -0800
committerAlon Zakai <alonzakai@gmail.com>2016-02-09 15:42:59 -0800
commitb528843ea6b68fe932ccad1d2ff5611b7c27a6d8 (patch)
treede6c36623cd235ab2fd12134292b87b1425912e6 /src
parentd5cc09449032972b07aaf4625349991fe61b62c1 (diff)
parent03495efec37b331652701e64dc72f985e6e9f7c2 (diff)
downloadbinaryen-b528843ea6b68fe932ccad1d2ff5611b7c27a6d8.tar.gz
binaryen-b528843ea6b68fe932ccad1d2ff5611b7c27a6d8.tar.bz2
binaryen-b528843ea6b68fe932ccad1d2ff5611b7c27a6d8.zip
Merge pull request #176 from WebAssembly/asan-op-parse
Fix out-of-bounds read
Diffstat (limited to 'src')
-rw-r--r--src/wasm-s-parser.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index ce216fd8e..c6cf1b32d 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -423,7 +423,10 @@ public:
if (dot) {
// type.operation (e.g. i32.add)
WasmType type = stringToWasmType(str, false, true);
- const char *op = dot + 1;
+ // Local copy to index into op without bounds checking.
+ constexpr size_t maxNameSize = 15;
+ char op[maxNameSize + 1] = { '\0' };
+ strncpy(op, dot + 1, maxNameSize);
switch (op[0]) {
case 'a': {
if (op[1] == 'b') return makeUnary(s, UnaryOp::Abs, type);