changeset:   98332:0d3b64bbc82c
branch:      3.5
parent:      98328:81869f8608ce
parent:      98330:46aaff5e8945
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun Sep 27 22:38:01 2015 +0300
files:       Misc/NEWS Modules/readline.c
description:
Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.


diff -r 81869f8608ce -r 0d3b64bbc82c Misc/NEWS
--- a/Misc/NEWS	Sun Sep 27 12:36:50 2015 -0400
+++ b/Misc/NEWS	Sun Sep 27 22:38:01 2015 +0300
@@ -21,6 +21,9 @@
 Library
 -------
 
+- Issue #25203: Failed readline.set_completer_delims() no longer left the
+  module in inconsistent state.
+
 - Issue #23329: Allow the ssl module to be built with older versions of
   LibreSSL.
 
diff -r 81869f8608ce -r 0d3b64bbc82c Modules/readline.c
--- a/Modules/readline.c	Sun Sep 27 12:36:50 2015 -0400
+++ b/Modules/readline.c	Sun Sep 27 22:38:01 2015 +0300
@@ -464,10 +464,11 @@
     /* Keep a reference to the allocated memory in the module state in case
        some other module modifies rl_completer_word_break_characters
        (see issue #17289). */
-    free(completer_word_break_characters);
-    completer_word_break_characters = strdup(break_chars);
-    if (completer_word_break_characters) {
-        rl_completer_word_break_characters = completer_word_break_characters;
+    break_chars = strdup(break_chars);
+    if (break_chars) {
+        free(completer_word_break_characters);
+        completer_word_break_characters = break_chars;
+        rl_completer_word_break_characters = break_chars;
         Py_RETURN_NONE;
     }
     else