py/parse: When looking up consts, check they exist before checking type.

dpgeorge · dpgeorge · commit 8d4d6731f56f · 2016-03-19T21:36:32.000Z
diff --git a/py/parse.c b/py/parse.c
@@ -620,7 +620,7 @@ STATIC bool fold_constants(parser_t *parser, const rule_t *rule, size_t num_args
         }
         mp_obj_t dest[2];
         mp_load_method_maybe(elem->value, q_attr, dest);
-        if (!(MP_OBJ_IS_INT(dest[0]) && dest[1] == MP_OBJ_NULL)) {
+        if (!(dest[0] != MP_OBJ_NULL && MP_OBJ_IS_INT(dest[0]) && dest[1] == MP_OBJ_NULL)) {
             return false;
         }
         arg0 = dest[0];

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ STATIC bool fold_constants(parser_t parser, const rule_t rule, size_t num_args`
`620`	`620`	`}`
`621`	`621`	`mp_obj_t dest[2];`
`622`	`622`	`mp_load_method_maybe(elem->value, q_attr, dest);`
`623`		`- if (!(MP_OBJ_IS_INT(dest[0]) && dest[1] == MP_OBJ_NULL)) {`
	`623`	`+ if (!(dest[0] != MP_OBJ_NULL && MP_OBJ_IS_INT(dest[0]) && dest[1] == MP_OBJ_NULL)) {`
`624`	`624`	`return false;`
`625`	`625`	`}`
`626`	`626`	`arg0 = dest[0];`