From: Xinchen Hui Date: Wed, 5 Mar 2014 03:44:51 +0000 (+0800) Subject: Fixed segfault X-Git-Tag: POST_PHPNG_MERGE~412^2~421^2~7 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63a1b349240ddc69577ab1e52249d21e7647e3c9;p=php Fixed segfault --- diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 69334933d4..39c0d17bc2 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -440,9 +440,11 @@ PHP_FUNCTION(stream_get_contents) } } - contents = php_stream_copy_to_mem(stream, maxlen, 0); - - RETURN_STR(contents); + if ((contents = php_stream_copy_to_mem(stream, maxlen, 0))) { + RETURN_STR(contents); + } else { + RETURN_EMPTY_STRING(); + } } /* }}} */