From: Sascha Schumann <sas@php.net>
Date: Wed, 14 May 2003 08:27:48 +0000 (+0000)
Subject: MFB segfault fix
X-Git-Tag: RELEASE_0_9b~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31dc62a905e85d1a9360dfb71cb13cf22e79ce0c;p=php

MFB segfault fix
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 096444272a..784acfca8d 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -451,7 +451,7 @@ 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 */
@@ -459,6 +459,8 @@ PHP_FUNCTION(file_get_contents)
 		}
 
 		RETVAL_STRINGL(contents, len, 0);
+	} else if (len == 0) {
+		RETVAL_EMPTY_STRING();
 	} else {
 		RETVAL_FALSE;
 	}