From: Sara Golemon <pollita@php.net>
Date: Fri, 24 Mar 2006 21:37:42 +0000 (+0000)
Subject: Fix stream_get_line():
X-Git-Tag: RELEASE_1_3~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dfc827d108b5a9e230ebbc0ba6ecac1f362c3d81;p=php

Fix stream_get_line():
Checking type isn't nearly as important as checking nullness...
---

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index ace8ce1e05..4d021aea35 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1259,14 +1259,18 @@ PHP_FUNCTION(stream_get_line)
 
 	if (php_stream_reads_unicode(stream)) {
 		UChar *buf;
+		UChar *d = NULL;
+		int dlen = 0;
 
-		if (Z_TYPE_PP(delim) != IS_UNICODE) {
+		if (delim) {
 			convert_to_unicode_ex(delim);
+			d = Z_USTRVAL_PP(delim);
+			dlen = Z_USTRLEN_PP(delim);
 		}
 
 		/* maxchars == maxlength will prevent the otherwise generous maxlen == max_length * 2
 		   from allocating beyond what's requested */
-		buf = php_stream_get_record_unicode(stream, max_length * 2, max_length, &buf_size, Z_USTRVAL_PP(delim), Z_USTRLEN_PP(delim) TSRMLS_CC);
+		buf = php_stream_get_record_unicode(stream, max_length * 2, max_length, &buf_size, d, dlen TSRMLS_CC);
 		if (!buf) {
 			RETURN_FALSE;
 		}
@@ -1274,12 +1278,16 @@ PHP_FUNCTION(stream_get_line)
 		RETURN_UNICODEL(buf, buf_size, 0);
 	} else {
 		char *buf;
+		char *d = NULL;
+		int dlen = 0;
 
-		if (Z_TYPE_PP(delim) != IS_STRING) {
+		if (delim) {
 			convert_to_string_ex(delim);
+			d = Z_STRVAL_PP(delim);
+			dlen = Z_STRLEN_PP(delim);
 		}
 
-		buf = php_stream_get_record(stream, max_length, &buf_size, Z_STRVAL_PP(delim), Z_STRLEN_PP(delim) TSRMLS_CC);
+		buf = php_stream_get_record(stream, max_length, &buf_size, d, dlen TSRMLS_CC);
 		if (!buf) {
 			RETURN_FALSE;
 		}