mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 22:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added some additional checks for sys.std?? is None, see #1440

Browse source
This commit is contained in:
Christian Heimes 2007-11-15 02:26:46 +00:00
parent 70021d7164
commit 2be03734f8
7 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_ctypes/callbacks.c
View file

@ -17,7 +17,7 @@ PrintError(char *msg, ...)
va_start(marker, msg); va_start(marker, msg);
vsnprintf(buf, sizeof(buf), msg, marker); vsnprintf(buf, sizeof(buf), msg, marker);
va_end(marker); va_end(marker);
if (f) if (f != NULL && f != Py_None)
PyFile_WriteString(buf, f); PyFile_WriteString(buf, f);
PyErr_Print(); PyErr_Print();
} }

2
Modules/_cursesmodule.c
View file

@ -2010,7 +2010,7 @@ PyCurses_setupterm(PyObject* self, PyObject *args, PyObject* keywds)
sys_stdout = PySys_GetObject("stdout"); sys_stdout = PySys_GetObject("stdout");
if (sys_stdout == NULL) { if (sys_stdout == NULL || sys_stdout == Py_None) {
PyErr_SetString( PyErr_SetString(
PyCursesError, PyCursesError,
"lost sys.stdout"); "lost sys.stdout");

2
Modules/threadmodule.c
View file

@ -429,7 +429,7 @@ t_bootstrap(void *boot_raw)
PySys_WriteStderr( PySys_WriteStderr(
"Unhandled exception in thread started by "); "Unhandled exception in thread started by ");
file = PySys_GetObject("stderr"); file = PySys_GetObject("stderr");
if (file) if (file != NULL && file != Py_None)
PyFile_WriteObject(boot->func, file, 0); PyFile_WriteObject(boot->func, file, 0);
else else
PyObject_Print(boot->func, stderr, 0); PyObject_Print(boot->func, stderr, 0);

6
Python/bltinmodule.c
View file

@ -1265,17 +1265,17 @@ builtin_input(PyObject *self, PyObject *args)
return NULL; return NULL;
/* Check that stdin/out/err are intact */ /* Check that stdin/out/err are intact */
if (fin == NULL) { if (fin == NULL || fin == Py_None) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"input(): lost sys.stdin"); "input(): lost sys.stdin");
return NULL; return NULL;
} }
if (fout == NULL) { if (fout == NULL || fout == Py_None) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"input(): lost sys.stdout"); "input(): lost sys.stdout");
return NULL; return NULL;
} }
if (ferr == NULL) { if (ferr == NULL || ferr == Py_None) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"input(): lost sys.stderr"); "input(): lost sys.stderr");
return NULL; return NULL;

2
Python/errors.c
View file

@ -626,7 +626,7 @@ PyErr_WriteUnraisable(PyObject *obj)
PyObject *f, *t, *v, *tb; PyObject *f, *t, *v, *tb;
PyErr_Fetch(&t, &v, &tb); PyErr_Fetch(&t, &v, &tb);
f = PySys_GetObject("stderr"); f = PySys_GetObject("stderr");
if (f != NULL) { if (f != NULL && f != Py_None) {
PyFile_WriteString("Exception ", f); PyFile_WriteString("Exception ", f);
if (t) { if (t) {
PyObject* moduleName; PyObject* moduleName;

13
Python/pythonrun.c
View file

@ -335,7 +335,7 @@ flush_std_files(void)
PyObject *ferr = PySys_GetObject("stderr"); PyObject *ferr = PySys_GetObject("stderr");
PyObject *tmp; PyObject *tmp;
if (fout != NULL) { if (fout != NULL && fout != Py_None) {
tmp = PyObject_CallMethod(fout, "flush", ""); tmp = PyObject_CallMethod(fout, "flush", "");
if (tmp == NULL) if (tmp == NULL)
PyErr_Clear(); PyErr_Clear();
@ -343,7 +343,7 @@ flush_std_files(void)
Py_DECREF(tmp); Py_DECREF(tmp);
} }
if (ferr != NULL) { if (ferr != NULL || ferr != Py_None) {
tmp = PyObject_CallMethod(ferr, "flush", ""); tmp = PyObject_CallMethod(ferr, "flush", "");
if (tmp == NULL) if (tmp == NULL)
PyErr_Clear(); PyErr_Clear();
@ -693,6 +693,8 @@ initsite(void)
m = PyImport_ImportModule("site"); m = PyImport_ImportModule("site");
if (m == NULL) { if (m == NULL) {
f = PySys_GetObject("stderr"); f = PySys_GetObject("stderr");
if (f == NULL || f == Py_None)
return;
if (Py_VerboseFlag) { if (Py_VerboseFlag) {
PyFile_WriteString( PyFile_WriteString(
"'import site' failed; traceback:\n", f); "'import site' failed; traceback:\n", f);
@ -900,7 +902,7 @@ PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags
if (fp == stdin) { if (fp == stdin) {
/* Fetch encoding from sys.stdin */ /* Fetch encoding from sys.stdin */
v = PySys_GetObject("stdin"); v = PySys_GetObject("stdin");
if (!v) if (v == NULL || v == Py_None)
return -1; return -1;
oenc = PyObject_GetAttrString(v, "encoding"); oenc = PyObject_GetAttrString(v, "encoding");
if (!oenc) if (!oenc)
@ -1293,7 +1295,10 @@ PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
int err = 0; int err = 0;
PyObject *f = PySys_GetObject("stderr"); PyObject *f = PySys_GetObject("stderr");
Py_INCREF(value); Py_INCREF(value);
if (f == NULL) { if (f == Py_None) {
/* pass */
}
else if (f == NULL) {
_PyObject_Dump(value); _PyObject_Dump(value);
fprintf(stderr, "lost sys.stderr\n"); fprintf(stderr, "lost sys.stderr\n");
} }

2
Python/sysmodule.c
View file

@ -89,7 +89,7 @@ sys_displayhook(PyObject *self, PyObject *o)
if (PyObject_SetAttrString(builtins, "_", Py_None) != 0) if (PyObject_SetAttrString(builtins, "_", Py_None) != 0)
return NULL; return NULL;
outf = PySys_GetObject("stdout"); outf = PySys_GetObject("stdout");
if (outf == NULL) { if (outf == NULL || outf == Py_None) {
PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout"); PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
return NULL; return NULL;
} }