summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-09-27 19:38:01 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-09-27 19:38:01 (GMT)
commit36aff2db4ae7e113a8fce91b46301bd85e9c2f3b (patch)
tree51f554e73a3069a88ada73f264c4aa92a69c2d7f
parentc944e34959914faabb57d18be7c04176d2bc5024 (diff)
parent113843937615b26fe8c0a4402c754c176cb7293a (diff)
downloadcpython-36aff2db4ae7e113a8fce91b46301bd85e9c2f3b.zip
cpython-36aff2db4ae7e113a8fce91b46301bd85e9c2f3b.tar.gz
cpython-36aff2db4ae7e113a8fce91b46301bd85e9c2f3b.tar.bz2
Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/readline.c9
2 files changed, 8 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1e13f63..241eafa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@ Core and Builtins
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 --git a/Modules/readline.c b/Modules/readline.c
index f6b52a0..675b722 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -464,10 +464,11 @@ set_completer_delims(PyObject *self, PyObject *args)
/* 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