mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #10350: Read and save errno before calling a function which might overwrite it.

Browse source 
Original patch by Hallvard B Furuseth.
This commit is contained in:
Antoine Pitrou 2011-12-16 12:28:32 +01:00
parent 87448819ab
commit c345ce1a69
7 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/readline.c
View file

@ -154,6 +154,7 @@ write_history_file(PyObject *self, PyObject *args)
{
PyObject *filename_obj = Py_None, *filename_bytes;
char *filename;
int err;
if (!PyArg_ParseTuple(args, "|O:write_history_file", &filename_obj))
return NULL;
if (filename_obj != Py_None) {
@ -164,10 +165,11 @@ write_history_file(PyObject *self, PyObject *args)
filename_bytes = NULL;
filename = NULL;
}
errno = write_history(filename);
if (!errno && _history_length >= 0)
errno = err = write_history(filename);
if (!err && _history_length >= 0)
history_truncate_file(filename, _history_length);
Py_XDECREF(filename_bytes);
errno = err;
if (errno)
return PyErr_SetFromErrno(PyExc_IOError);
Py_RETURN_NONE;
@ -970,7 +972,7 @@ readline_until_enter_or_signal(char *prompt, int *signal)
completed_input_string = not_done_reading;
while (completed_input_string == not_done_reading) {
int has_input = 0;
int has_input = 0, err = 0;
while (!has_input)
{ struct timeval timeout = {0, 100000}; /* 0.1 seconds */
@ -984,13 +986,14 @@ readline_until_enter_or_signal(char *prompt, int *signal)
/* select resets selectset if no input was available */
has_input = select(fileno(rl_instream) + 1, &selectset,
NULL, NULL, timeoutp);
err = errno;
if(PyOS_InputHook) PyOS_InputHook();
}
if(has_input > 0) {
if (has_input > 0) {
rl_callback_read_char();
}
else if (errno == EINTR) {
else if (err == EINTR) {
int s;
#ifdef WITH_THREAD
PyEval_RestoreThread(_PyOS_ReadlineTState);