From e654c11f565d1be32062931dc0a1817004b7387b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Mon, 30 Apr 2012 06:10:41 +0200 Subject: Issue #14433: Prevent msvcrt crash in interactive prompt when stdin is closed. --- Misc/NEWS | 3 +++ Parser/myreadline.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 53aa074..3b896d1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.2.4 Core and Builtins ----------------- +- Issue #14433: Prevent msvcrt crash in interactive prompt when stdin + is closed. + - Issue #11603 (again): Setting __repr__ to __str__ now raises a RuntimeError when repr() or str() is called on such an object. diff --git a/Parser/myreadline.c b/Parser/myreadline.c index 33d5b3d..cb1cf0f 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -42,7 +42,10 @@ my_fgets(char *buf, int len, FILE *fp) (void)(PyOS_InputHook)(); errno = 0; clearerr(fp); - p = fgets(buf, len, fp); + if (_PyVerify_fd(fileno(fp))) + p = fgets(buf, len, fp); + else + p = NULL; if (p != NULL) return 0; /* No error */ err = errno; -- cgit v0.12