Minor correction to the stdprinter object.

gvanrossum · gvanrossum · commit c6ecfcd87655 · 2007-10-30T18:36:44.000Z
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
@@ -352,14 +352,16 @@ PyFile_NewStdPrinter(int fd)
 {
 	PyStdPrinter_Object *self;
 
-	if (fd != 1 && fd != 2) {
+	if (fd != fileno(stdout) && fd != fileno(stderr)) {
 		PyErr_BadInternalCall();
 		return NULL;
 	}
 
 	self = PyObject_New(PyStdPrinter_Object,
 			    &PyStdPrinter_Type);
-	self->fd = fd;
+        if (self != NULL) {
+		self->fd = fd;
+	}
 	return (PyObject*)self;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -352,14 +352,16 @@ PyFile_NewStdPrinter(int fd)`
`352`	`352`	`{`
`353`	`353`	`PyStdPrinter_Object *self;`
`354`	`354`
`355`		`- if (fd != 1 && fd != 2) {`
	`355`	`+ if (fd != fileno(stdout) && fd != fileno(stderr)) {`
`356`	`356`	`PyErr_BadInternalCall();`
`357`	`357`	`return NULL;`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`self = PyObject_New(PyStdPrinter_Object,`
`361`	`361`	`&PyStdPrinter_Type);`
`362`		`- self->fd = fd;`
	`362`	`+ if (self != NULL) {`
	`363`	`+ self->fd = fd;`
	`364`	`+ }`
`363`	`365`	`return (PyObject*)self;`
`364`	`366`	`}`
`365`	`367`