PHPC-149: Iterator holding on to dead results

bjori · bjori · commit 02d022df47a5 · 2015-02-02T13:20:36.000-08:00
diff --git a/php_phongo.c b/php_phongo.c
@@ -1292,6 +1292,10 @@ void php_phongo_result_free(php_phongo_result_t *result)
 		mongoc_cursor_destroy(result->cursor);
 		result->cursor = NULL;
 	}
+	if (result->visitor_data.zchild) {
+		zval_ptr_dtor(&result->visitor_data.zchild);
+		result->visitor_data.zchild = NULL;
+	}
 }
 
 /* {{{ Iterator */
@@ -1308,8 +1312,6 @@ static void phongo_cursor_it_invalidate_current(zend_object_iterator *iter TSRML
 
 static void phongo_cursor_it_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
 {
-	iter->funcs->invalidate_current(iter TSRMLS_CC);
-
 	efree(iter);
 } /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1292,6 +1292,10 @@ void php_phongo_result_free(php_phongo_result_t *result)`
`1292`	`1292`	`mongoc_cursor_destroy(result->cursor);`
`1293`	`1293`	`result->cursor = NULL;`
`1294`	`1294`	`}`
	`1295`	`+ if (result->visitor_data.zchild) {`
	`1296`	`+ zval_ptr_dtor(&result->visitor_data.zchild);`
	`1297`	`+ result->visitor_data.zchild = NULL;`
	`1298`	`+ }`
`1295`	`1299`	`}`
`1296`	`1300`
`1297`	`1301`	`/* {{{ Iterator */`
`@@ -1308,8 +1312,6 @@ static void phongo_cursor_it_invalidate_current(zend_object_iterator *iter TSRML`
`1308`	`1312`
`1309`	`1313`	`static void phongo_cursor_it_dtor(zend_object_iterator iter TSRMLS_DC) / {{{ */`
`1310`	`1314`	`{`
`1311`		`- iter->funcs->invalidate_current(iter TSRMLS_CC);`
`1312`		`-`
`1313`	`1315`	`efree(iter);`
`1314`	`1316`	`} /* }}} */`
`1315`	`1317`