mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix CID-1414686: PyInit_readline() handles errors (#4647)

Browse source 
Handle PyModule_AddIntConstant() and PyModule_AddStringConstant()
failures. Add also constants before calling setup_readline(), since
setup_readline() registers callbacks which uses a reference to the
module, whereas the module is destroyed if adding constants fails.

Fix Coverity warning:

CID 1414686: Unchecked return value (CHECKED_RETURN)
2. check_return: Calling PyModule_AddStringConstant without checking
return value (as is done elsewhere 45 out of 55 times).
This commit is contained in:
Victor Stinner 2017-11-30 17:21:07 +01:00 • committed by GitHub
parent 86afc1f2a7
commit 0efc0249ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/readline.c
View file

@ -1352,13 +1352,27 @@ PyInit_readline(void)
if (m == NULL)
return NULL;
if (PyModule_AddIntConstant(m, "_READLINE_VERSION",
RL_READLINE_VERSION) < 0) {
goto error;
}
if (PyModule_AddIntConstant(m, "_READLINE_RUNTIME_VERSION",
rl_readline_version) < 0) {
goto error;
}
if (PyModule_AddStringConstant(m, "_READLINE_LIBRARY_VERSION",
rl_library_version) < 0)
{
goto error;
}
mod_state = (readlinestate *) PyModule_GetState(m);
PyOS_ReadlineFunctionPointer = call_readline;
setup_readline(mod_state);
PyModule_AddIntConstant(m, "_READLINE_VERSION", RL_READLINE_VERSION);
PyModule_AddIntConstant(m, "_READLINE_RUNTIME_VERSION", rl_readline_version);
PyModule_AddStringConstant(m, "_READLINE_LIBRARY_VERSION", rl_library_version);
return m;
error:
Py_DECREF(m);
return NULL;
}