diff options
| author | Xinchen Hui <laruence@php.net> | 2011-09-30 15:08:32 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-09-30 15:08:32 +0000 |
| commit | 554dd6cd02ae624b03df2df15e4b75ae9fb2d8ea (patch) | |
| tree | e03b57641c90320d9518a5d71a160226b2946757 | |
| parent | f40e5204d4ea3968ce92b62fadc6b5993cec37d8 (diff) | |
| download | php-git-554dd6cd02ae624b03df2df15e4b75ae9fb2d8ea.tar.gz | |
A better fix for #55817 (thanks to bjori)
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 7501343fee..bc39561720 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3017,7 +3017,7 @@ PHP_FUNCTION(mb_detect_encoding) /* make encoding list */ list = NULL; size = 0; - if (ZEND_NUM_ARGS() >= 2) { + if (ZEND_NUM_ARGS() >= 2 && !ZVAL_IS_NULL(encoding_list)) { switch (Z_TYPE_P(encoding_list)) { case IS_ARRAY: if (!php_mb_parse_encoding_array(encoding_list, &list, &size, 0 TSRMLS_CC)) { |