PHPC-135: Fix memory leak var_dump()ing Query and add test

Author: bjori

src/MongoDB/Query.c

@@ -120,38 +120,44 @@ zend_object_value php_phongo_query_create_object(zend_class_entry *class_type TS
 
 	return retval;
 } /* }}} */
+
 HashTable *php_phongo_query_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_query_t    *intern;
-	zval                  *retval = NULL;
+	zval                   retval = zval_used_for_init;
 
 
-	*is_temp = 0;
+	*is_temp = 1;
 	intern = (php_phongo_query_t *)zend_object_store_get_object(object TSRMLS_CC);
 
-	MAKE_STD_ZVAL(retval);
-	array_init(retval);
+	array_init_size(&retval, 6);
 
 	if (intern->query) {
 		php_phongo_bson_state  state = PHONGO_BSON_STATE_INITIALIZER;
 
 		MAKE_STD_ZVAL(state.zchild);
 		bson_to_zval(bson_get_data(intern->query), intern->query->len, &state);
-		add_assoc_zval_ex(retval, ZEND_STRS("query"), state.zchild);
+		add_assoc_zval_ex(&retval, ZEND_STRS("query"), state.zchild);
+	} else {
+		add_assoc_null_ex(&retval, ZEND_STRS("query"));
 	}
+
 	if (intern->selector) {
 		php_phongo_bson_state  state = PHONGO_BSON_STATE_INITIALIZER;
 
 		MAKE_STD_ZVAL(state.zchild);
 		bson_to_zval(bson_get_data(intern->selector), intern->selector->len, &state);
-		add_assoc_zval_ex(retval, ZEND_STRS("selector"), state.zchild);
+		add_assoc_zval_ex(&retval, ZEND_STRS("selector"), state.zchild);
+	} else {
+		add_assoc_null_ex(&retval, ZEND_STRS("selector"));
 	}
-	add_assoc_long_ex(retval, ZEND_STRS("flags"), intern->flags);
-	add_assoc_long_ex(retval, ZEND_STRS("skip"), intern->skip);
-	add_assoc_long_ex(retval, ZEND_STRS("limit"), intern->limit);
-	add_assoc_long_ex(retval, ZEND_STRS("batch_size"), intern->batch_size);
 
-	return Z_ARRVAL_P(retval);
+	add_assoc_long_ex(&retval, ZEND_STRS("flags"), intern->flags);
+	add_assoc_long_ex(&retval, ZEND_STRS("skip"), intern->skip);
+	add_assoc_long_ex(&retval, ZEND_STRS("limit"), intern->limit);
+	add_assoc_long_ex(&retval, ZEND_STRS("batch_size"), intern->batch_size);
+
+	return Z_ARRVAL(retval);
 
 } /* }}} */
 /* }}} */

tests/functional/query-sort-003.phpt

@@ -15,6 +15,7 @@ $query = new MongoDB\Driver\Query(array(), array(
 ));
 
 $qr = $manager->executeQuery(NS, $query);
+var_dump($query);
 
 $cursor = $qr->getIterator();
 var_dump(get_class($qr), get_class($cursor));
@@ -26,7 +27,35 @@ foreach ($cursor as $document) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
+object(MongoDB\Driver\Query)#%d (6) {
+  ["query"]=>
+  array(2) {
+    ["$orderby"]=>
+    object(stdClass)#%d (1) {
+      ["username"]=>
+      int(1)
+    }
+    ["$query"]=>
+    object(stdClass)#%d (0) {
+    }
+  }
+  ["selector"]=>
+  array(2) {
+    ["_id"]=>
+    int(0)
+    ["username"]=>
+    int(1)
+  }
+  ["flags"]=>
+  int(0)
+  ["skip"]=>
+  int(0)
+  ["limit"]=>
+  int(0)
+  ["batch_size"]=>
+  int(0)
+}
 string(26) "MongoDB\Driver\QueryResult"
 string(21) "MongoDB\Driver\Cursor"
 abernathy.audrey