MFB: Improved parameter handling

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 283e03860dbdb3ce2ce65f25b94bc92259c284b1..3f06774226e3d7a7eb2a937ca71f1031998dcad1 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2412,13 +2412,13 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type,
        zend_class_entry *ce = NULL;
 
        if (into_object) {
-               char *class_name;
+               char *class_name = NULL;
                int class_name_len;
 
                if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|z!sz", &result, &zrow, &class_name, &class_name_len, &ctor_params) == FAILURE) {
                        return;
-                       }
-               if (ZEND_NUM_ARGS() < 3) {
+               }
+               if (!class_name) {
                        ce = zend_standard_class_def;
                } else {
                        ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC);