diff options
| author | Arnaud Le Blanc <lbarnaud@php.net> | 2009-04-19 17:10:35 +0000 |
|---|---|---|
| committer | Arnaud Le Blanc <lbarnaud@php.net> | 2009-04-19 17:10:35 +0000 |
| commit | 8ea9eb8560c02818a06369cdc33a2b2367964526 (patch) | |
| tree | 03fd524b7e30fa1516596e2025bc7e29338c3211 /main/streams/cast.c | |
| parent | bd7f4375a3dabf883fe1f018a89d07a39ae36af5 (diff) | |
| download | php-git-8ea9eb8560c02818a06369cdc33a2b2367964526.tar.gz | |
MFH: Better fix for #47997
Diffstat (limited to 'main/streams/cast.c')
| -rw-r--r-- | main/streams/cast.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/cast.c b/main/streams/cast.c index 06805c709c..5e61357537 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -214,9 +214,9 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show newstream = php_stream_fopen_tmpfile(); if (newstream) { - size_t copied = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL); + int ret = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL); - if (copied == PHP_STREAM_FAILURE) { + if (ret != SUCCESS) { php_stream_close(newstream); } else { int retcode = php_stream_cast(newstream, castas | flags, ret, show_err); @@ -332,7 +332,7 @@ PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream **newstr (*newstream)->open_lineno = origstream->open_lineno; #endif - if (php_stream_copy_to_stream_ex(origstream, *newstream, PHP_STREAM_COPY_ALL) == PHP_STREAM_FAILURE) { + if (php_stream_copy_to_stream_ex(origstream, *newstream, PHP_STREAM_COPY_ALL, NULL) != SUCCESS) { php_stream_close(*newstream); *newstream = NULL; return PHP_STREAM_CRITICAL; |