From 862edc6aaefafd58394804771a0fabc4230bd7d1 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Wed, 14 May 2003 01:08:47 +0000 Subject: [PATCH] Fix file_get_contents segfault on empty file --- ext/standard/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/standard/file.c b/ext/standard/file.c index 35691a34e9..66bc863005 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -434,14 +434,15 @@ PHP_FUNCTION(file_get_contents) } /* uses mmap if possible */ - if ((len = php_stream_copy_to_mem(stream, &contents, PHP_STREAM_COPY_ALL, 0)) >= 0) { - + if ((len = php_stream_copy_to_mem(stream, &contents, PHP_STREAM_COPY_ALL, 0)) > 0) { if (PG(magic_quotes_runtime)) { contents = php_addslashes(contents, len, &newlen, 1 TSRMLS_CC); /* 1 = free source string */ len = newlen; } RETVAL_STRINGL(contents, len, 0); + } else if (len == 0) { + RETVAL_EMPTY_STRING(); } else { RETVAL_FALSE; } -- 2.40.0