extmod: Make ujson.loads raise exception if given empty string.

dpgeorge · dpgeorge · commit 5f64dc55d894 · 2015-02-02T21:52:19.000Z
Addresses issue adafruit#1097.
diff --git a/extmod/modujson.c b/extmod/modujson.c
@@ -239,7 +239,8 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
         // unexpected chars
         goto fail;
     }
-    if (stack.len != 0) {
+    if (stack_top == MP_OBJ_NULL || stack.len != 0) {
+        // not exactly 1 object
         goto fail;
     }
     vstr_clear(&vstr);
diff --git a/tests/extmod/ujson_loads.py b/tests/extmod/ujson_loads.py
@@ -33,3 +33,9 @@ def my_print(o):
 
 # whitespace handling
 my_print(json.loads('{\n\t"a":[]\r\n, "b":[1], "c":{"3":4}     \n\r\t\r\r\r\n}'))
+
+# loading nothing should raise exception
+try:
+    json.loads('')
+except ValueError:
+    print('ValueError')

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,8 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {`
`239`	`239`	`// unexpected chars`
`240`	`240`	`goto fail;`
`241`	`241`	`}`
`242`		`- if (stack.len != 0) {`
	`242`	`+ if (stack_top == MP_OBJ_NULL \|\| stack.len != 0) {`
	`243`	`+ // not exactly 1 object`
`243`	`244`	`goto fail;`
`244`	`245`	`}`
`245`	`246`	`vstr_clear(&vstr);`