fix issue #23 (PHP-7.1 JSON compat)

[m6w6/ext-pq] / src / php_pq_params.c

diff --git a/src/php_pq_params.c b/src/php_pq_params.c
index ead7fac8d720398b6c46c2fc5b70f706eb2af43d..5a5156ff32d85b758498e3459edc2369cffdcde0 100644 (file)
--- a/src/php_pq_params.c
+++ b/src/php_pq_params.c
@@ -83,6 +83,9 @@ static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid t
        case PHP_PQ_OID_JSONB:
 #      endif
        case PHP_PQ_OID_JSON:
+#      if PHP_VERSION_ID >= 70100
+               JSON_G(encode_max_depth) = PHP_JSON_PARSER_DEFAULT_DEPTH;
+#      endif
                php_json_encode(&str, zobj, PHP_JSON_UNESCAPED_UNICODE);
                smart_str_0(&str);
                return str.s;
@@ -130,10 +133,16 @@ static int apply_to_param_from_array(zval *zparam, void *arg_ptr)
                ZVAL_LONG(&ztype, arg->type);
                zend_call_method_with_2_params(arg->zconv, NULL, NULL, "converttostring", &rv, zparam, &ztype);
                str = zval_get_string(&rv);
+               zval_ptr_dtor(&rv);
                goto append_string;
 
        } else {
+               again:
                switch (Z_TYPE_P(zparam)) {
+               case IS_REFERENCE:
+                       ZVAL_DEREF(zparam);
+                       goto again;
+
                case IS_NULL:
                        smart_str_appends(arg->buffer, "NULL");
                        break;
@@ -209,7 +218,6 @@ static zend_string *array_param_to_string(php_pq_params_t *p, zval *zarr, Oid ty
                smart_str_appendc(arg.buffer, '{');
                SEPARATE_ZVAL(zarr);
                zend_hash_apply_with_argument(Z_ARRVAL_P(zarr), apply_to_param_from_array, &arg);
-               zval_ptr_dtor(zarr);
                smart_str_appendc(arg.buffer, '}');
                break;
        }
@@ -238,7 +246,12 @@ static void php_pq_params_set_param(php_pq_params_t *p, unsigned index, zval *zp
                char tmp_str[64];
                size_t tmp_len = 0;
 
+               again:
                switch (Z_TYPE_P(zpp)) {
+               case IS_REFERENCE:
+                       ZVAL_DEREF(zpp);
+                       goto again;
+
                case IS_NULL:
                        p->param.strings[index] = NULL;
                        return;
@@ -257,7 +270,7 @@ static void php_pq_params_set_param(php_pq_params_t *p, unsigned index, zval *zp
                        break;
 
                case IS_ARRAY:
-                       str = array_param_to_string(p, &tmp, type);
+                       str = array_param_to_string(p, zpp, type);
                        break;
 
                case IS_OBJECT:
@@ -265,7 +278,6 @@ static void php_pq_params_set_param(php_pq_params_t *p, unsigned index, zval *zp
                                break;
                        }
                        /* no break */
-
                default:
                        str = zval_get_string(zpp);
                        break;