Issue #18408: Fix Python-ast.c: handle init_types() failure (ex: MemoryError)

vstinner · vstinner · commit bdf630c4a7e0 · 2013-07-17T00:17:15.000+02:00
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -1191,7 +1191,8 @@ class PartingShots(StaticVisitor):
     CODE = """
 PyObject* PyAST_mod2obj(mod_ty t)
 {
-    init_types();
+    if (!init_types())
+        return NULL;
     return ast2obj_mod(t);
 }
 
@@ -1205,7 +1206,8 @@ class PartingShots(StaticVisitor):
     int isinstance;
     assert(0 <= mode && mode <= 2);
 
-    init_types();
+    if (!init_types())
+        return NULL;
 
     isinstance = PyObject_IsInstance(ast, req_type[mode]);
     if (isinstance == -1)
@@ -1223,7 +1225,8 @@ class PartingShots(StaticVisitor):
 
 int PyAST_Check(PyObject* obj)
 {
-    init_types();
+    if (!init_types())
+        return -1;
     return PyObject_IsInstance(obj, (PyObject*)&AST_type);
 }
 """
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
@@ -7188,7 +7188,8 @@ PyInit__ast(void)
 
 PyObject* PyAST_mod2obj(mod_ty t)
 {
-    init_types();
+    if (!init_types())
+        return NULL;
     return ast2obj_mod(t);
 }
 
@@ -7202,7 +7203,8 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
     int isinstance;
     assert(0 <= mode && mode <= 2);
 
-    init_types();
+    if (!init_types())
+        return NULL;
 
     isinstance = PyObject_IsInstance(ast, req_type[mode]);
     if (isinstance == -1)
@@ -7220,7 +7222,8 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
 
 int PyAST_Check(PyObject* obj)
 {
-    init_types();
+    if (!init_types())
+        return -1;
     return PyObject_IsInstance(obj, (PyObject*)&AST_type);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1191,7 +1191,8 @@ class PartingShots(StaticVisitor):`
`1191`	`1191`	`CODE = """`
`1192`	`1192`	`PyObject* PyAST_mod2obj(mod_ty t)`
`1193`	`1193`	`{`
`1194`		`- init_types();`
	`1194`	`+ if (!init_types())`
	`1195`	`+ return NULL;`
`1195`	`1196`	`return ast2obj_mod(t);`
`1196`	`1197`	`}`
`1197`	`1198`
`@@ -1205,7 +1206,8 @@ class PartingShots(StaticVisitor):`
`1205`	`1206`	`int isinstance;`
`1206`	`1207`	`assert(0 <= mode && mode <= 2);`
`1207`	`1208`
`1208`		`- init_types();`
	`1209`	`+ if (!init_types())`
	`1210`	`+ return NULL;`
`1209`	`1211`
`1210`	`1212`	`isinstance = PyObject_IsInstance(ast, req_type[mode]);`
`1211`	`1213`	`if (isinstance == -1)`
`@@ -1223,7 +1225,8 @@ class PartingShots(StaticVisitor):`
`1223`	`1225`
`1224`	`1226`	`int PyAST_Check(PyObject* obj)`
`1225`	`1227`	`{`
`1226`		`- init_types();`
	`1228`	`+ if (!init_types())`
	`1229`	`+ return -1;`
`1227`	`1230`	`return PyObject_IsInstance(obj, (PyObject*)&AST_type);`
`1228`	`1231`	`}`
`1229`	`1232`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -7188,7 +7188,8 @@ PyInit__ast(void)`
`7188`	`7188`
`7189`	`7189`	`PyObject* PyAST_mod2obj(mod_ty t)`
`7190`	`7190`	`{`
`7191`		`- init_types();`
	`7191`	`+ if (!init_types())`
	`7192`	`+ return NULL;`
`7192`	`7193`	`return ast2obj_mod(t);`
`7193`	`7194`	`}`
`7194`	`7195`
`@@ -7202,7 +7203,8 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)`
`7202`	`7203`	`int isinstance;`
`7203`	`7204`	`assert(0 <= mode && mode <= 2);`
`7204`	`7205`
`7205`		`- init_types();`
	`7206`	`+ if (!init_types())`
	`7207`	`+ return NULL;`
`7206`	`7208`
`7207`	`7209`	`isinstance = PyObject_IsInstance(ast, req_type[mode]);`
`7208`	`7210`	`if (isinstance == -1)`
`@@ -7220,7 +7222,8 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)`
`7220`	`7222`
`7221`	`7223`	`int PyAST_Check(PyObject* obj)`
`7222`	`7224`	`{`
`7223`		`- init_types();`
	`7225`	`+ if (!init_types())`
	`7226`	`+ return -1;`
`7224`	`7227`	`return PyObject_IsInstance(obj, (PyObject*)&AST_type);`
`7225`	`7228`	`}`
`7226`	`7229`