diff options
| author | Anatol Belski <ab@php.net> | 2017-02-07 12:03:21 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-02-07 12:03:21 +0100 |
| commit | 265c53dbbf3ea310895a728495e9bd319d6d5793 (patch) | |
| tree | fc83c72e079045a027fda80ed670ea1e4a152d88 /Zend/zend_exceptions.c | |
| parent | 546af1966e56a90ba7ce5ccd434c63b60f14881e (diff) | |
| parent | fd521a22f75f248993d0696adf6f4f9be6557dda (diff) | |
| download | php-git-265c53dbbf3ea310895a728495e9bd319d6d5793.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 d4bc9884df..1846439e74 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); |