]> granicus.if.org Git - php/commitdiff
check for NULL, then add flag
authorAntony Dovgal <tony2001@php.net>
Thu, 22 Feb 2007 10:06:02 +0000 (10:06 +0000)
committerAntony Dovgal <tony2001@php.net>
Thu, 22 Feb 2007 10:06:02 +0000 (10:06 +0000)
sapi/cli/php_cli.c

index 33231445c2761f6eb9910640698c5cd53e4e6436..4176ebb0822b42d50667ec11ea1ec36101a210e6 100644 (file)
@@ -487,12 +487,6 @@ static void cli_register_file_handles(TSRMLS_D)
        s_out = php_stream_open_wrapper_ex("php://stdout", "wb", 0, NULL, sc_out);
        s_err = php_stream_open_wrapper_ex("php://stderr", "wb", 0, NULL, sc_err);
 
-#if PHP_DEBUG
-       /* do not close stdout and stderr */
-       s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-       s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
-#endif
-
        if (s_in==NULL || s_out==NULL || s_err==NULL) {
                FREE_ZVAL(zin);
                FREE_ZVAL(zout);
@@ -502,7 +496,13 @@ static void cli_register_file_handles(TSRMLS_D)
                if (s_err) php_stream_close(s_err);
                return;
        }
-       
+
+#if PHP_DEBUG
+       /* do not close stdout and stderr */
+       s_out->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+       s_err->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+#endif
+
        s_in_process = s_in;
 
        php_stream_to_zval(s_in,  zin);