summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-01-19 06:09:39 +0000
committerNeal Norwitz <nnorwitz@gmail.com>2006-01-19 06:09:39 +0000
commitbc26c3d05080a66c1f4070b87bac5188e5dfab85 (patch)
tree395453563b1bc2f5b8d7321046a9790f6e1a8460 /Python
parentbe04cc0bec9a7ca748a957384795af18aacd08c1 (diff)
downloadcpython-bc26c3d05080a66c1f4070b87bac5188e5dfab85.tar.gz
Check return result from Py_InitModule*(). This API can fail.
Probably should be backported.
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c2
-rw-r--r--Python/marshal.c2
-rw-r--r--Python/sysmodule.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/Python/import.c b/Python/import.c
index f284ff4d21..8bd25f7764 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2817,6 +2817,8 @@ initimp(void)
m = Py_InitModule4("imp", imp_methods, doc_imp,
NULL, PYTHON_API_VERSION);
+ if (m == NULL)
+ goto failure;
d = PyModule_GetDict(m);
if (setint(d, "SEARCH_ERROR", SEARCH_ERROR) < 0) goto failure;
diff --git a/Python/marshal.c b/Python/marshal.c
index ff8247c9f2..5617226787 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1107,5 +1107,7 @@ PyMODINIT_FUNC
PyMarshal_Init(void)
{
PyObject *mod = Py_InitModule("marshal", marshal_methods);
+ if (mod == NULL)
+ return;
PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION);
}
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 5bbe950224..f793b99348 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1027,6 +1027,8 @@ _PySys_Init(void)
#endif
m = Py_InitModule3("sys", sys_methods, sys_doc);
+ if (m == NULL)
+ return NULL;
sysdict = PyModule_GetDict(m);
{