From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 6 Jun 2005 12:50:57 +0000 (+0000)
Subject: MFH: Fixed strval to not print notices on strval(array()).
X-Git-Tag: php-4.4.0RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44518f05f892db7cfe3b85a6a039853656a4fee1;p=php

MFH: Fixed strval to not print notices on strval(array()).
---

diff --git a/ext/standard/type.c b/ext/standard/type.c
index f09ca87730..240f781710 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -180,14 +180,24 @@ PHP_FUNCTION(floatval)
 PHP_FUNCTION(strval)
 {
 	pval **num;
+	zval expr_copy;
+	int use_copy;
 
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
 	*return_value = **num;
-	zval_copy_ctor(return_value);
-	convert_to_string(return_value);
+
+	zend_make_printable_zval(return_value, &expr_copy, &use_copy);
+	if (use_copy) {
+		*return_value = expr_copy;
+		INIT_PZVAL(return_value);
+		zval_copy_ctor(return_value);
+		zval_dtor(&expr_copy);
+	} else {
+		zval_copy_ctor(return_value);
+	}
 }
 /* }}} */