From: Sara Golemon <pollita@php.net>
Date: Fri, 22 Sep 2006 18:23:33 +0000 (+0000)
Subject: Tweak file_get_contents()'s return value a little
X-Git-Tag: RELEASE_1_0_0RC1~1585
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29ccb96d9e9693a07f55ac7d28377a1add4563df;p=php

Tweak file_get_contents()'s return value a little
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 298735933e..a8b7b124a2 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -512,7 +512,7 @@ PHP_FUNCTION(file_get_contents)
 	char *filename;
 	int filename_len;
 	zend_uchar filename_type;
-	void *contents;
+	void *contents = NULL;
 	long flags = 0;
 	php_stream *stream;
 	int len;
@@ -552,21 +552,32 @@ PHP_FUNCTION(file_get_contents)
 	if (maxlen <= 0 || stream->readbuf_type == IS_STRING) {
 		real_maxlen = maxlen;
 	} else {
-		/* Allows worst case scenario of each input char being turned into two UChars */
-		real_maxlen = (maxlen * 2);
+		/* Allows worst case scenario of each input char being turned into two UChars
+		 * UTODO: Have this take converter into account, since many never generate surrogate pairs */
+		real_maxlen = maxlen * 2;
 	}
 
 	/* uses mmap if possible */
 	len = php_stream_copy_to_mem_ex(stream, stream->readbuf_type, &contents, real_maxlen, maxlen, 0);
 
-	if (stream->readbuf_type == IS_STRING && len > 0) {
-		RETVAL_STRINGL(contents, len, 0);
-	} else if (stream->readbuf_type == IS_UNICODE && len > 0) {
-		RETVAL_UNICODEL(contents, len, 0);
-	} else if (len == 0) {
-		RETVAL_EMPTY_STRING();
+	if (stream->readbuf_type == IS_STRING) {
+		if (len > 0) {
+			RETVAL_STRINGL(contents, len, 0);
+		} else {
+			if (contents) {
+				efree(contents);
+			}
+			RETVAL_EMPTY_STRING();
+		}
 	} else {
-		RETVAL_FALSE;
+		if (len > 0) {
+			RETVAL_UNICODEL(contents, len, 0);
+		} else {
+			if (contents) {
+				efree(contents);
+			}
+			RETVAL_EMPTY_UNICODE();
+		}
 	}
 
 	php_stream_close(stream);