Fixed issue #19

mikechambers · Apr 30, 2007 · de24d26 · de24d26
1 parent fe02e83
commit de24d26
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/com/adobe/serialization/json/JSONDecoder.as b/src/com/adobe/serialization/json/JSONDecoder.as
@@ -192,7 +192,13 @@ package com.adobe.serialization.json {
 		/**
 		 * Attempt to parse a value
 		 */
-		private function parseValue():Object {
+		private function parseValue():Object
+		{
+			// Catch errors when the input stream ends abruptly
+			if ( token == null )
+			{
+				tokenizer.parseError( "Unexpected end of input" );
+			}
 
 			switch ( token.type ) {
 				case JSONTokenType.LEFT_BRACE:

diff --git a/tests/com/adobe/serialization/json/JSONTest.as b/tests/com/adobe/serialization/json/JSONTest.as
@@ -321,6 +321,23 @@ package com.adobe.serialization.json
 			}
 			assertEquals( 4, count );
 		}
+
+		public function testDecodeEmptyStringError():void
+		{
+			var e:Error = null;
+
+			try
+			{
+				JSON.decode( "" );
+			}
+			catch ( pe:JSONParseError )
+			{
+				e = pe;
+			}
+
+			assertNotNull( e );
+			assertTrue( "Caught parse error", e is JSONParseError );
+		}
 	}
 
 }