diff options
| author | Zeev Suraski <zeev@php.net> | 2000-04-28 13:31:51 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-04-28 13:31:51 +0000 |
| commit | ddc36fb7763565667477564f747eff637d785e9e (patch) | |
| tree | f1ce4b1c2897f6dc5f288e9a3db82b81cd4b798a /Zend/zend_operators.c | |
| parent | 3220bb570e2968b2d14460db0b9e7a5615592091 (diff) | |
| download | php-git-ddc36fb7763565667477564f747eff637d785e9e.tar.gz | |
Make convert_to_string() allocations traceable
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index cd7ad72b09..991385932b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -322,7 +322,7 @@ ZEND_API void convert_to_boolean(zval *op) } -ZEND_API void convert_to_string(zval *op) +ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) { long lval; double dval; @@ -337,7 +337,7 @@ ZEND_API void convert_to_string(zval *op) break; case IS_BOOL: if (op->value.lval) { - op->value.str.val = estrndup("1", 1); + op->value.str.val = estrndup_rel("1", 1); op->value.str.len = 1; } else { op->value.str.val = empty_string; @@ -347,24 +347,24 @@ ZEND_API void convert_to_string(zval *op) case IS_LONG: lval = op->value.lval; - op->value.str.val = (char *) emalloc(MAX_LENGTH_OF_LONG + 1); + op->value.str.val = (char *) emalloc_rel(MAX_LENGTH_OF_LONG + 1); op->value.str.len = zend_sprintf(op->value.str.val, "%ld", lval); /* SAFE */ break; case IS_DOUBLE: { dval = op->value.dval; - op->value.str.val = (char *) emalloc(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1); + op->value.str.val = (char *) emalloc_rel(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1); op->value.str.len = zend_sprintf(op->value.str.val, "%.*G", (int) EG(precision), dval); /* SAFE */ /* %G already handles removing trailing zeros from the fractional part, yay */ break; } case IS_ARRAY: zval_dtor(op); - op->value.str.val = estrndup("Array",sizeof("Array")-1); + op->value.str.val = estrndup_rel("Array",sizeof("Array")-1); op->value.str.len = sizeof("Array")-1; break; case IS_OBJECT: zval_dtor(op); - op->value.str.val = estrndup("Object",sizeof("Object")-1); + op->value.str.val = estrndup_rel("Object",sizeof("Object")-1); op->value.str.len = sizeof("Object")-1; break; default: |