From: Nikita Popov Date: Wed, 28 May 2014 16:55:51 +0000 (+0200) Subject: Use zend_long_to_str in wddx X-Git-Tag: POST_PHPNG_MERGE~248 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e2bc83fdbaa37ccc2b38ec36b3d49a96376ba93;p=php Use zend_long_to_str in wddx --- diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 3b4357ae36..dc7ea834b6 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -300,8 +300,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx) if ((ret = php_wddx_deserialize_ex(val, vallen, &retval)) == SUCCESS) { ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(retval), idx, key, ent) { if (key == NULL) { - key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0); - key->len = snprintf(key->val, key->len + 1, "%ld", idx); + key = zend_long_to_str(idx); } else { STR_ADDREF(key); } @@ -513,8 +512,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj) php_wddx_serialize_var(packet, ent, tmp TSRMLS_CC); STR_RELEASE(tmp); } else { - key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0); - key->len = snprintf(key->val, key->len + 1, "%ld", idx); + key = zend_long_to_str(idx); php_wddx_serialize_var(packet, ent, key TSRMLS_CC); STR_RELEASE(key); } @@ -570,8 +568,7 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr) if (key) { php_wddx_serialize_var(packet, ent, key TSRMLS_CC); } else { - key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0); - key->len = snprintf(key->val, key->len + 1, "%ld", idx); + key = zend_long_to_str(idx); php_wddx_serialize_var(packet, ent, key TSRMLS_CC); STR_RELEASE(key); }