From 24992f477f21167efafdc8d5f1a2a9fd197baab6 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Wed, 27 Jan 2016 13:45:38 -0800
Subject: parse 0-size blocks

---
 src/wasm-binary.h   | 4 +---
 src/wasm-s-parser.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index 08be2019a..10bd40ece 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1275,9 +1275,7 @@ public:
       readExpression(child);
       curr->list.push_back(child);
     }
-    if (num == 0) {
-      curr->type = none;
-    } else {
+    if (num > 0) {
       curr->type = curr->list.back()->type;
     }
     breakStack.pop_back();
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 242a4b5a9..65c06ab6f 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -705,7 +705,7 @@ private:
       ret->list.push_back(parseExpression(s[i]));
     }
     labelStack.pop_back();
-    ret->type = ret->list.back()->type;
+    if (ret->list.size() > 0) ret->type = ret->list.back()->type;
     return ret;
   }
 
-- 
cgit v1.2.3