summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-05-06 19:51:03 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-05-06 19:51:03 (GMT)
commita7f7deb6eddc666aee507c04633d95ed78e289e0 (patch)
tree6bbd9049530eb827e21e9214b547ab4f34a4ac11 /Modules
parent002a77d2f7253c26bee9cbd8269a6b32d8c25fba (diff)
downloadcpython-a7f7deb6eddc666aee507c04633d95ed78e289e0.zip
cpython-a7f7deb6eddc666aee507c04633d95ed78e289e0.tar.gz
cpython-a7f7deb6eddc666aee507c04633d95ed78e289e0.tar.bz2
Issue #17289: The readline module now plays nicer with external modules or applications changing the rl_completer_word_break_characters global variable.
Initial patch by Bradley Froehle.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/readline.c25
1 files changed, 18 insertions, 7 deletions
diff --git a/Modules/readline.c b/Modules/readline.c
index a710652..71c2423 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -70,6 +70,10 @@ on_completion_display_matches_hook(char **matches,
int num_matches, int max_length);
#endif
+/* Memory allocated for rl_completer_word_break_characters
+ (see issue #17289 for the motivation). */
+static char *completer_word_break_characters;
+
/* Exported function to send one line to readline's init file parser */
static PyObject *
@@ -368,12 +372,20 @@ set_completer_delims(PyObject *self, PyObject *args)
{
char *break_chars;
- if(!PyArg_ParseTuple(args, "s:set_completer_delims", &break_chars)) {
+ if (!PyArg_ParseTuple(args, "s:set_completer_delims", &break_chars)) {
return NULL;
}
- free((void*)rl_completer_word_break_characters);
- rl_completer_word_break_characters = strdup(break_chars);
- Py_RETURN_NONE;
+ /* 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;
+ Py_RETURN_NONE;
+ }
+ else
+ return PyErr_NoMemory();
}
PyDoc_STRVAR(doc_set_completer_delims,
@@ -918,7 +930,8 @@ setup_readline(void)
/* Set our completion function */
rl_attempted_completion_function = (CPPFunction *)flex_complete;
/* Set Python word break characters */
- rl_completer_word_break_characters =
+ completer_word_break_characters =
+ rl_completer_word_break_characters =
strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
/* All nonalphanums except '.' */
@@ -1174,8 +1187,6 @@ PyInit_readline(void)
if (m == NULL)
return NULL;
-
-
PyOS_ReadlineFunctionPointer = call_readline;
setup_readline();
return m;