Show a proper error on an invalid type in binary reading ; fixes #1872 (#1874)

kripken · web-flow · commit 0e5e55053c17 · 2019-01-19T05:30:43.000-08:00
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
@@ -847,9 +847,9 @@ Type WasmBinaryBuilder::getType() {
     case BinaryConsts::EncodedType::f32: return f32;
     case BinaryConsts::EncodedType::f64: return f64;
     case BinaryConsts::EncodedType::v128: return v128;
-    case BinaryConsts::EncodedType::AnyFunc:
-    case BinaryConsts::EncodedType::Func:
+    default: {
       throwError("invalid wasm type: " + std::to_string(type));
+    }
   }
   WASM_UNREACHABLE();
 }

Original file line number	Diff line number	Diff line change
`@@ -847,9 +847,9 @@ Type WasmBinaryBuilder::getType() {`
`847`	`847`	`case BinaryConsts::EncodedType::f32: return f32;`
`848`	`848`	`case BinaryConsts::EncodedType::f64: return f64;`
`849`	`849`	`case BinaryConsts::EncodedType::v128: return v128;`
`850`		`- case BinaryConsts::EncodedType::AnyFunc:`
`851`		`- case BinaryConsts::EncodedType::Func:`
	`850`	`+ default: {`
`852`	`851`	`throwError("invalid wasm type: " + std::to_string(type));`
	`852`	`+ }`
`853`	`853`	`}`
`854`	`854`	`WASM_UNREACHABLE();`
`855`	`855`	`}`