commit a1f46fe51cd4d10d1b4714e6887bf8cc4cee1a47
author Sam Clegg <sbc@chromium.org> Sat Apr 20 00:11:46 2019 +0000
committer Sam Clegg <sbc@chromium.org> Sat Apr 20 00:11:46 2019 +0000
tree 258d6e9b5d66bf5151830148a164f312e7d41ad6
parent acd8f7a0e558705a4a0d77fd35517f710831c867

[WebAssembly] Object: Improve error messages on invalid section

Also add a test.

Differential Revision: https://reviews.llvm.org/D60836

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358801 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Object/WasmObjectFile.cpp

diff --git a/lib/Object/WasmObjectFile.cpp b/lib/Object/WasmObjectFile.cpp
index 167b8c2..45e343f 100644
--- a/lib/Object/WasmObjectFile.cpp
+++ b/lib/Object/WasmObjectFile.cpp
@@ -319,8 +319,8 @@
   case wasm::WASM_SEC_DATACOUNT:
     return parseDataCountSection(Ctx);
   default:
-    return make_error<GenericBinaryError>("Bad section type",
-                                          object_error::parse_failed);
+    return make_error<GenericBinaryError>(
+        "Invalid section type: " + Twine(Sec.Type), object_error::parse_failed);
   }
 }
 
@@ -1607,7 +1607,7 @@
   case wasm::WASM_SEC_EVENT:
     return WASM_SEC_ORDER_EVENT;
   default:
-    llvm_unreachable("invalid section");
+    return WASM_SEC_ORDER_NONE;
   }
 }
 

test/Object/wasm-invalid-file.yaml

diff --git a/test/Object/wasm-invalid-file.yaml b/test/Object/wasm-invalid-file.yaml
index 309fbd4..e562dfa 100644
--- a/test/Object/wasm-invalid-file.yaml
+++ b/test/Object/wasm-invalid-file.yaml
@@ -14,3 +14,9 @@
 # RUN: not llvm-objdump -h %t.wasm 2>&1 | FileCheck %s -check-prefix=CHECK-SECTION-SIZE
 
 # CHECK-SECTION-SIZE: '{{.*}}.wasm': Section too large
+
+# RUN: yaml2obj %s > %t.wasm
+# # Append an section with invalid type (type 0x20, size 0x1, content 0x0)
+# RUN: echo -e -n "\x20\x01\x00" >> %t.wasm
+# RUN: not llvm-objdump -h %t.wasm 2>&1 | FileCheck %s -check-prefix=CHECK-SECTION-TYPE
+# CHECK-SECTION-TYPE: '{{.*}}.wasm': Invalid section type: 32