[Python-checkins] bpo-38631: Avoid Py_FatalError() in readline (GH-16998)

Wed Oct 30 11:39:31 EDT 2019

https://github.com/python/cpython/commit/1d8da61f5ad26274556e0bbce260ce292d0402a1
commit: 1d8da61f5ad26274556e0bbce260ce292d0402a1
branch: master
author: Victor Stinner <vstinner at python.org>
committer: GitHub <noreply at github.com>
date: 2019年10月30日T16:39:27+01:00
summary:
bpo-38631: Avoid Py_FatalError() in readline (GH-16998)
readline now calls PyErr_NoMemory() rather than Py_FatalError() on
memory allocation failure, when importing the module.
files:
M Modules/readline.c

diff --git a/Modules/readline.c b/Modules/readline.c
index 930e63975c5ce..b76861f7b0407 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1066,15 +1066,16 @@ flex_complete(const char *text, int start, int end)
 }
 
 
-/* Helper to initialize GNU readline properly. */
-
-static void
+/* Helper to initialize GNU readline properly.
+ Return -1 on memory allocation failure, return 0 on success. */
+static int
 setup_readline(readlinestate *mod_state)
 {
 #ifdef SAVE_LOCALE
 char *saved_locale = strdup(setlocale(LC_CTYPE, NULL));
- if (!saved_locale)
- Py_FatalError("not enough memory to save locale");
+ if (!saved_locale) {
+ return -1;
+ }
 #endif
 
 /* The name must be defined before initialization */
@@ -1156,6 +1157,7 @@ setup_readline(readlinestate *mod_state)
 rl_initialize();
 
 RESTORE_LOCALE(saved_locale)
+ return 0;
 }
 
 /* Wrapper around GNU readline that handles signals differently. */
@@ -1369,7 +1371,10 @@ PyInit_readline(void)
 
 mod_state = (readlinestate *) PyModule_GetState(m);
 PyOS_ReadlineFunctionPointer = call_readline;
- setup_readline(mod_state);
+ if (setup_readline(mod_state) < 0) {
+ PyErr_NoMemory();
+ goto error;
+ }
 
 return m;
 
