diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-12 12:14:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-12 12:14:45 +0800 |
| commit | 7903276f4c18fcfda06c02785f0b4201421f9c7c (patch) | |
| tree | 00aecb82831c9ea8891d5959a5d587d752f00e13 /Zend/zend_exceptions.c | |
| parent | 966311e6274e59d0eabdccf5bf9c5d554c90202c (diff) | |
| download | php-git-7903276f4c18fcfda06c02785f0b4201421f9c7c.tar.gz | |
backport to 5.6 (we should not unset the default value)
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 66476a1517..fda4d21e03 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -230,7 +230,7 @@ ZEND_METHOD(exception, __construct) Exception unserialize checks */ #define CHECK_EXC_TYPE(name, type) \ value = zend_read_property(default_exception_ce, object, name, sizeof(name)-1, 0 TSRMLS_CC); \ - if(value && Z_TYPE_P(value) != type) { \ + if (value && Z_TYPE_P(value) != IS_NULL && Z_TYPE_P(value) != type) { \ zval *tmp; \ MAKE_STD_ZVAL(tmp); \ ZVAL_STRINGL(tmp, name, sizeof(name)-1, 1); \ |