Browse Source

check for NULL, then add flag

migration/RELEASE_1_0_0
Antony Dovgal 20 years ago
parent
commit
30239ea383
  1. 14
      sapi/cli/php_cli.c

14
sapi/cli/php_cli.c

@ -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);

Loading…
Cancel
Save