[Python-checkins] python/dist/src/Python sysmodule.c, 2.126.2.3, 2.126.2.4

nnorwitz@users.sourceforge.net nnorwitz at users.sourceforge.net
Mon Oct 3 03:03:48 CEST 2005


Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17796/Python

Modified Files:
      Tag: release24-maint
	sysmodule.c 
Log Message:
Backport:
SF bug #887946, segfault if redirecting directory
Also provide a warning if a directory is passed on the command line.
Add minimal command line test.


Index: sysmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.126.2.3
retrieving revision 2.126.2.4
diff -u -d -r2.126.2.3 -r2.126.2.4
--- sysmodule.c	15 Sep 2005 13:00:25 -0000	2.126.2.3
+++ sysmodule.c	3 Oct 2005 01:03:45 -0000	2.126.2.4
@@ -947,6 +947,15 @@
 	m = Py_InitModule3("sys", sys_methods, sys_doc);
 	sysdict = PyModule_GetDict(m);
 
+	{
+		/* XXX: does this work on Win/Win64? (see posix_fstat) */
+		struct stat sb;
+		if (fstat(fileno(stdin), &sb) == 0 &&
+		    S_ISDIR(sb.st_mode)) {
+			Py_FatalError("<stdin> is a directory");
+		}
+	}
+
 	/* Closing the standard FILE* if sys.std* goes aways causes problems
 	 * for embedded Python usages. Closing them when somebody explicitly
 	 * invokes .close() might be possible, but the FAQ promises they get



More information about the Python-checkins mailing list