From: Victor Stinner <vstinner@python.org>
Date: Wed, 30 Oct 2019 15:39:27 +0000 (+0100)
Subject: bpo-38631: Avoid Py_FatalError() in readline (GH-16998)
X-Git-Tag: v3.9.0a1~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d8da61f5ad26274556e0bbce260ce292d0402a1;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Modules/readline.c b/Modules/readline.c
index 930e63975c5c..b76861f7b040 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1066,15 +1066,16 @@ done:
 }
 
 
-/* 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;