From: Xinchen Hui <laruence@php.net>
Date: Fri, 30 Sep 2011 15:08:32 +0000 (+0000)
Subject: A better fix for #55817 (thanks to bjori)
X-Git-Tag: php-5.3.9RC1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=554dd6cd02ae624b03df2df15e4b75ae9fb2d8ea;p=php

A better fix for #55817 (thanks to bjori)
---

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)) {