[wasm] Add support and unittests for decoding signed LEB128.

src/wasm/decoder.h

Index: src/wasm/decoder.h
diff --git a/src/wasm/decoder.h b/src/wasm/decoder.h
index 0e88eda022de439228b6f862098dff55376ae954..7e7047c5e6e8e6f09a9882978dac78cc78b229db 100644
--- a/src/wasm/decoder.h
+++ b/src/wasm/decoder.h
@@ -99,13 +99,31 @@ class Decoder {
     }
     DCHECK_LE(ptr - (base + offset), kMaxDiff);
     *length = static_cast<int>(ptr - (base + offset));
-    if (ptr == end && (b & 0x80)) {
-      error(base, ptr, msg);
-      return 0;
+    if (ptr == end) {
+      if (*length == 5 && (b & 0xF0) != 0) {

[bradn, 2016/02/29 06:30:00]

5 -> kMaxDiff ?

[titzer, 2016/02/29 16:51:46]

Done.

+        error(base, ptr, "extra bits in LEB128");
+        return 0;
+      }
+      if (b & 0x80) {

[bradn, 2016/02/29 06:30:00]

might be good to be consistent between b & 0x80 vs (b & 0x80) != 0 -- as in the
condition above.

[titzer, 2016/02/29 16:51:46]

Done.

+        error(base, ptr, msg);
+        return 0;
+      }
     }
     return result;
   }
 
+  // Reads a variable-length signed integer (little endian).
+  int32_t checked_read_i32v(const byte* base, int offset, int* length,
+                            const char* msg = "expected SLEB128") {
+    uint32_t result = checked_read_u32v(base, offset, length, msg);
+    if (*length == 5) return bit_cast<int32_t>(result);
+    if (*length > 0) {
+      int shift = 32 - 7 * *length;
+      return bit_cast<int32_t>(result << shift) >> shift;
+    }
+    return 0;
+  }
+
   // Reads a single 16-bit unsigned integer (little endian).
   inline uint16_t read_u16(const byte* ptr) {
     DCHECK(ptr >= start_ && (ptr + 2) <= end_);
@@ -232,12 +250,6 @@ class Decoder {
     }
   }
 
-  bool RangeOk(const byte* pc, int length) {
-    if (pc < start_ || pc_ >= limit_) return false;
-    if ((pc + length) >= limit_) return false;
-    return true;
-  }
-
   void error(const char* msg) { error(pc_, nullptr, msg); }
 
   void error(const byte* pc, const char* msg) { error(pc, nullptr, msg); }
@@ -287,8 +299,8 @@ class Decoder {
       result.start = start_;
       result.error_pc = error_pc_;
       result.error_pt = error_pt_;
-      result.error_msg = error_msg_;
-      error_msg_.Reset(nullptr);
+      // transfer ownership of the error to the result.
+      result.error_msg.Reset(error_msg_.Detach());
     } else {
       result.error_code = kSuccess;
     }
@@ -310,6 +322,9 @@ class Decoder {
   bool ok() const { return error_pc_ == nullptr; }
   bool failed() const { return error_pc_ != nullptr; }
 
+  const byte* start() { return start_; }
+  const byte* pc() { return pc_; }
+
  protected:
   const byte* start_;
   const byte* pc_;