changeset:   98331:d867ca794bdb
branch:      2.7
parent:      98321:e7e54526cdfa
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun Sep 27 22:34:59 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 e7e54526cdfa -r d867ca794bdb Misc/NEWS
--- a/Misc/NEWS	Sun Sep 27 02:13:40 2015 -0700
+++ b/Misc/NEWS	Sun Sep 27 22:34:59 2015 +0300
@@ -37,6 +37,9 @@
 Library
 -------
 
+- Issue #25203: Failed readline.set_completer_delims() no longer left the
+  module in inconsistent state.
+
 - Issue #19143: platform module now reads Windows version from kernel32.dll to
   avoid compatibility shims.
 
diff -r e7e54526cdfa -r d867ca794bdb Modules/readline.c
--- a/Modules/readline.c	Sun Sep 27 02:13:40 2015 -0700
+++ b/Modules/readline.c	Sun Sep 27 22:34:59 2015 +0300
@@ -355,10 +355,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