From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 6 Mar 2018 18:58:40 +0000 (+0300)
Subject: Avoid double copying
X-Git-Tag: php-7.3.0alpha1~243
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9716bd68a3e9d207d78da59aecab7785867e94de;p=php

Avoid double copying
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 6dce2ffadf..d7c6bbb25a 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -543,10 +543,9 @@ try_again:
 		case IS_STRING:
 			break;
 		case IS_RESOURCE: {
-			char buf[sizeof("Resource id #") + MAX_LENGTH_OF_LONG];
-			int len = snprintf(buf, sizeof(buf), "Resource id #" ZEND_LONG_FMT, (zend_long)Z_RES_HANDLE_P(op));
+			zend_string *str = zend_strpprintf(0, "Resource id #" ZEND_LONG_FMT, (zend_long)Z_RES_HANDLE_P(op));
 			zval_ptr_dtor(op);
-			ZVAL_NEW_STR(op, zend_string_init(buf, len, 0));
+			ZVAL_NEW_STR(op, str);
 			break;
 		}
 		case IS_LONG: {
@@ -861,11 +860,7 @@ try_again:
 		case IS_TRUE:
 			return ZSTR_CHAR('1');
 		case IS_RESOURCE: {
-			char buf[sizeof("Resource id #") + MAX_LENGTH_OF_LONG];
-			int len;
-
-			len = snprintf(buf, sizeof(buf), "Resource id #" ZEND_LONG_FMT, (zend_long)Z_RES_HANDLE_P(op));
-			return zend_string_init(buf, len, 0);
+			return zend_strpprintf(0, "Resource id #" ZEND_LONG_FMT, (zend_long)Z_RES_HANDLE_P(op));
 		}
 		case IS_LONG: {
 			return zend_long_to_str(Z_LVAL_P(op));