validate all function indexes in binary reading (#1887)

fixes bug reported in comment on e63c4a7 , #1885 (comment) , #1879 (comment)
WebAssembly · Jan 24, 2019 · 85e95e3 · 85e95e3
1 parent 119525e
commit 85e95e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
@@ -967,6 +967,9 @@ void WasmBinaryBuilder::readSignatures() {
 }
 
 Name WasmBinaryBuilder::getFunctionIndexName(Index i) {
+  if (i >= wasm.functions.size()) {
+    throwError("invalid function index");
+  }
   return wasm.functions[i]->name;
 }
 
@@ -1505,9 +1508,6 @@ void WasmBinaryBuilder::processFunctions() {
     auto index = exportIndexes[curr];
     switch (curr->kind) {
       case ExternalKind::Function: {
-        if (index >= wasm.functions.size()) {
-          throwError("bad function export index");
-        }
         curr->value = getFunctionIndexName(index);
         break;
       }