MFB: Improved param parsing

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 644728a7d696462ade2c86496691acf445eec5d0..268bbe73e42fab8e68d41172543952181cd46f25 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1721,17 +1721,16 @@ PHP_FUNCTION(mb_http_output)
    Sets the current detect_order or Return the current detect_order as a array */
 PHP_FUNCTION(mb_detect_order)
 {
-       size_t argc = ZEND_NUM_ARGS();
-       zval **arg1;
+       zval **arg1 = NULL;
        int n, size;
        enum mbfl_no_encoding *list, *entry;
        char *name;
 
-       if (zend_parse_parameters(argc TSRMLS_CC, "|Z", &arg1) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|Z", &arg1) == FAILURE) {
                return;
        }
 
-       if (argc == 0) {
+       if (!arg1) {
                array_init(return_value);
                entry = MBSTRG(current_detect_order_list);
                n = MBSTRG(current_detect_order_list_size);
@@ -1784,13 +1783,13 @@ PHP_FUNCTION(mb_detect_order)
    Sets the current substitute_character or returns the current substitute_character */
 PHP_FUNCTION(mb_substitute_character)
 {
-       zval **arg1;
+       zval **arg1 = NULL;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|Z", &arg1) == FAILURE) {
                return;
        }
 
-       if (ZEND_NUM_ARGS() == 0) {
+       if (!arg1) {
                if (MBSTRG(current_filter_illegal_mode) == MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE) {
                        RETURN_STRING("none", 1);
                } else if (MBSTRG(current_filter_illegal_mode) == MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG) {