diff options
| author | Anatol Belski <ab@php.net> | 2017-02-07 12:04:25 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-02-07 12:04:25 +0100 |
| commit | 623478a2d6304cb6ddf79826be2eb5aee9cd1aed (patch) | |
| tree | b891175fa1e51e9e88290e3268c3d40e541b0ba4 /Zend/zend_exceptions.c | |
| parent | 31332d094127b6332018cd146b9becbd7566e60c (diff) | |
| parent | 265c53dbbf3ea310895a728495e9bd319d6d5793 (diff) | |
| download | php-git-623478a2d6304cb6ddf79826be2eb5aee9cd1aed.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
switch to smart str conversion routine to hide exact NAN type
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index c355d066ef..ea38f67de6 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -521,8 +521,8 @@ static void _build_trace_args(zval *arg, smart_str *str) /* {{{ */ break; case IS_DOUBLE: { double dval = Z_DVAL_P(arg); - char *s_tmp = emalloc(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1); - int l_tmp = zend_sprintf(s_tmp, "%.*G", (int) EG(precision), dval); /* SAFE */ + char *s_tmp; + size_t l_tmp = zend_spprintf(&s_tmp, MAX_LENGTH_OF_DOUBLE + EG(precision) + 1, "%.*G", (int) EG(precision), dval); /* SAFE */ smart_str_appendl(str, s_tmp, l_tmp); smart_str_appends(str, ", "); efree(s_tmp); |