PCBC-476: Do not call destructors on uninitialized values

Change-Id: I68510f9c3cad82fa887936e532640e03fb7e0f78 Reviewed-on: http://review.couchbase.org/76581 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
petk · Apr 12, 2017 · 7ced000 · 7ced000
1 parent 432c2e5
commit 7ced000
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/package2.xml b/package2.xml
@@ -39,6 +39,8 @@
         * PCBC-473: fix incorrect bucket reference copy in subdocument
           mutation/lookup builders, which might lead to segfault.
         * PCBC-474: fix segfault when using ViewQuery::keys()
+        * PCBC-476: do not call destructors on unintialized ZVALs. Fixes possible
+          segfaults with view queries on PHP 5.x.
     </notes>
 
     <contents>

diff --git a/src/couchbase/bucket/http.c b/src/couchbase/bucket/http.c
@@ -34,9 +34,7 @@ void http_callback(lcb_t instance, int cbtype, const lcb_RESPBASE *rb)
         pcbc_log(LOGARGS(instance, WARN), "Failed to perform HTTP request: rc=%d", (int)resp->rc);
     }
 
-#if PHP_VERSION_ID < 70000
-    MAKE_STD_ZVAL(result->bytes);
-#endif
+    PCBC_ZVAL_ALLOC(result->bytes);
     if (resp->nbody) {
         if (((opcookie *)rb->cookie)->json_response) {
             int last_error;

diff --git a/src/couchbase/bucket/n1ql.c b/src/couchbase/bucket/n1ql.c
@@ -36,9 +36,8 @@ static void n1qlrow_callback(lcb_t instance, int ignoreme, const lcb_RESPN1QL *r
         result->header.err = LCB_SUCCESS;
     }
     result->rflags = resp->rflags;
-#if PHP_VERSION_ID < 70000
-    MAKE_STD_ZVAL(result->row);
-#endif
+    PCBC_ZVAL_ALLOC(result->row);
+    ZVAL_NULL(PCBC_P(result->row));
     if (cookie->json_response) {
         int last_error;
         int json_options = cookie->json_options;
@@ -104,9 +103,8 @@ static lcb_error_t proc_n1qlrow_results(zval *return_value, opcookie *cookie TSR
 
     if (err == LCB_SUCCESS) {
         PCBC_ZVAL rows;
-#if PHP_VERSION_ID < 70000
-        MAKE_STD_ZVAL(rows);
-#endif
+
+        PCBC_ZVAL_ALLOC(rows);
         array_init(PCBC_P(rows));
 
         object_init(return_value);

diff --git a/src/couchbase/bucket/view.c b/src/couchbase/bucket/view.c
@@ -33,11 +33,14 @@ static void viewrow_callback(lcb_t instance, int ignoreme, const lcb_RESPVIEWQUE
     int last_error;
     TSRMLS_FETCH();
 
-#if PHP_VERSION_ID < 70000
-    MAKE_STD_ZVAL(result->id);
-    MAKE_STD_ZVAL(result->key);
-    MAKE_STD_ZVAL(result->value);
-#endif
+    PCBC_ZVAL_ALLOC(result->id);
+    PCBC_ZVAL_ALLOC(result->key);
+    PCBC_ZVAL_ALLOC(result->value);
+
+    ZVAL_NULL(PCBC_P(result->id));
+    ZVAL_NULL(PCBC_P(result->key));
+    ZVAL_NULL(PCBC_P(result->value));
+
     result->header.err = resp->rc;
     result->rflags = resp->rflags;
     if (result->header.err == LCB_SUCCESS) {
@@ -57,8 +60,6 @@ static void viewrow_callback(lcb_t instance, int ignoreme, const lcb_RESPVIEWQUE
                              last_error);
                     PCBC_STRINGL(result->value, resp->value, resp->nvalue);
                 }
-            } else {
-                ZVAL_NULL(PCBC_P(result->value));
             }
 
             if (resp->nkey) {
@@ -70,8 +71,6 @@ static void viewrow_callback(lcb_t instance, int ignoreme, const lcb_RESPVIEWQUE
                         PCBC_STRINGL(result->key, resp->key, resp->nkey);
                     }
                 }
-            } else {
-                ZVAL_NULL(PCBC_P(result->key));
             }
         } else {
             PCBC_STRINGL(result->key, resp->key, resp->nkey);
@@ -132,9 +131,8 @@ static lcb_error_t proc_viewrow_results(zval *return_value, opcookie *cookie TSR
 
     if (err == LCB_SUCCESS) {
         PCBC_ZVAL rows;
-#if PHP_VERSION_ID < 70000
-        MAKE_STD_ZVAL(rows);
-#endif
+
+        PCBC_ZVAL_ALLOC(rows);
         array_init(PCBC_P(rows));
 
         object_init(return_value);
@@ -153,9 +151,8 @@ static lcb_error_t proc_viewrow_results(zval *return_value, opcookie *cookie TSR
                 }
             } else {
                 PCBC_ZVAL row;
-#if PHP_VERSION_ID < 70000
-                MAKE_STD_ZVAL(row);
-#endif
+
+                PCBC_ZVAL_ALLOC(row);
                 object_init(PCBC_P(row));
                 add_property_zval(PCBC_P(row), "id", PCBC_P(res->id));
                 add_property_zval(PCBC_P(row), "key", PCBC_P(res->key));