diff options
| author | Nikita Popov <nikic@php.net> | 2014-04-09 15:51:28 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-04-09 23:41:16 +0200 |
| commit | 20f2e5986e7d9e5978eaed8d6d60cd6bf917ea37 (patch) | |
| tree | 0c3237e875f1e40fc4aa5daf1a971a1f7187c84d /Zend/zend_operators.c | |
| parent | 2016e72111f371e8e4d96f6d7cb870ca0e673175 (diff) | |
| download | php-git-20f2e5986e7d9e5978eaed8d6d60cd6bf917ea37.tar.gz | |
Fix ZTS build
This only makes it compile, it doesn't actually work, presumably
because interned strings are assumed in some places.
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 93d7652436..f6c2a9161f 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -611,15 +611,18 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) /* {{{ */ double dval; switch (Z_TYPE_P(op)) { - case IS_NULL: + case IS_NULL: { + TSRMLS_FETCH(); ZVAL_EMPTY_STRING(op); break; + } case IS_STRING: break; case IS_BOOL: if (Z_LVAL_P(op)) { ZVAL_NEW_STR(op, STR_INIT("1", 1, 0)); } else { + TSRMLS_FETCH(); ZVAL_EMPTY_STRING(op); } break; |