diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2013-10-10 14:18:20 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2013-10-10 14:18:20 (GMT) |
commit | 2fe9bac4dca34e86d44b7e169f3795fde4c841a1 (patch) | |
tree | bdfa2e05ffa05074b815c1c02ec23d3effcd23d3 /Modules/readline.c | |
parent | 6cf185dc064577c6f472c86741e91fb28ec82e2d (diff) | |
download | cpython-2fe9bac4dca34e86d44b7e169f3795fde4c841a1.zip cpython-2fe9bac4dca34e86d44b7e169f3795fde4c841a1.tar.gz cpython-2fe9bac4dca34e86d44b7e169f3795fde4c841a1.tar.bz2 |
Close #16742: Fix misuse of memory allocations in PyOS_Readline()
The GIL must be held to call PyMem_Malloc(), whereas PyOS_Readline() releases
the GIL to read input.
The result of the C callback PyOS_ReadlineFunctionPointer must now be a string
allocated by PyMem_RawMalloc() or PyMem_RawRealloc() (or NULL if an error
occurred), instead of a string allocated by PyMem_Malloc() or PyMem_Realloc().
Fixing this issue was required to setup a hook on PyMem_Malloc(), for example
using the tracemalloc module.
PyOS_Readline() copies the result of PyOS_ReadlineFunctionPointer() into a new
buffer allocated by PyMem_Malloc(). So the public API of PyOS_Readline() does
not change.
Diffstat (limited to 'Modules/readline.c')
-rw-r--r-- | Modules/readline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/readline.c b/Modules/readline.c index c154e1d..668ee02 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1176,7 +1176,7 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt) /* We got an EOF, return a empty string. */ if (p == NULL) { - p = PyMem_Malloc(1); + p = PyMem_RawMalloc(1); if (p != NULL) *p = '\0'; RESTORE_LOCALE(saved_locale) @@ -1204,7 +1204,7 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt) /* Copy the malloc'ed buffer into a PyMem_Malloc'ed one and release the original. */ q = p; - p = PyMem_Malloc(n+2); + p = PyMem_RawMalloc(n+2); if (p != NULL) { strncpy(p, q, n); p[n] = '\n'; |