Merge pull request #109 from maciejhirsz/bugfixes

Fixes #106

Author: maciejhirsz

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "json"
-version = "0.11.5"
+version = "0.11.6"
 authors = ["Maciej Hirsz <maciej.hirsz@gmail.com>"]
 description = "JSON implementation in Rust"
 repository = "https://github.com/maciejhirsz/json-rust"

src/parser.rs

@@ -281,10 +281,14 @@ macro_rules! allow_number_extensions {
     // quite handy as the only number that can begin with zero, has to have
     // a zero mantissa. Leading zeroes are illegal in JSON!
     ($parser:ident) => ({
-        let mut num = 0;
-        let mut e = 0;
-        let ch = $parser.read_byte();
-        allow_number_extensions!($parser, num, e, ch)
+        if $parser.is_eof() {
+            0.into()
+        } else {
+            let mut num = 0;
+            let mut e = 0;
+            let ch = $parser.read_byte();
+            allow_number_extensions!($parser, num, e, ch)
+        }
     })
 }
 
@@ -383,6 +387,8 @@ impl<'a> Parser<'a> {
     // is virtually irrelevant.
     #[inline(always)]
     fn read_byte(&mut self) -> u8 {
+        debug_assert!(self.index < self.length, "Reading out of bounds");
+
         unsafe { *self.byte_ptr.offset(self.index as isize) }
     }
 

tests/parse.rs

@@ -327,3 +327,9 @@ fn does_not_panic_on_single_unicode_char() {
     assert!(parse(&string).is_err());
 }
 
+#[test]
+fn does_not_panic_on_single_zero() {
+    let source = "0";
+
+    parse(source).unwrap();
+}