ok, now running without a crash

Author: MagicalTux

git2_tests/000_base.php

@@ -30,4 +30,15 @@
 var_dump(bin2hex($tree->id()));
 var_dump($tree->entrycount());
 
+$cb = function($root, $entry, &$data) {
+	echo "$root => ".$entry->name()." ($data)\n";
+	$data .= 'o';
+	return 0;
+};
+$test = 'hello';
+
+$tree->walk(Git2\Tree::WALK_POST, $cb, $test);
+
+var_dump($test);
+
 

git2_tree.c

@@ -82,7 +82,7 @@ GIT2_TREE_GET_LONG(entrycount)
 
 struct git2_treewalk_payload {
 	zval *this;
-	zval **callback_data;
+	zval *callback_data;
 	zend_fcall_info callback_i;
 	zend_fcall_info_cache callback_ic;
 };
@@ -94,26 +94,28 @@ static int git2_treewalk_cb(const char *root, const git_tree_entry *entry, void
 	struct git2_treewalk_payload *p = payload;
 
 	ZVAL_STRING(&argv[0], root);
-	git2_tree_entry_spawn(&argv[1], entry);
-	ZVAL_COPY_VALUE(&argv[2], *p->callback_data);
+	git2_tree_entry_spawn_ephemeral(&argv[1], entry);
+	ZVAL_COPY_VALUE(&argv[2], p->callback_data);
 
 	p->callback_i.retval = &retval;
 	p->callback_i.param_count = 3;
 	p->callback_i.params = argv;
 
-	// TODO HERE
 	error = zend_call_function(&p->callback_i, &p->callback_ic);
 	if (error == FAILURE) {
 		return -1; // causes end of walk
 	} else if (!Z_ISUNDEF(retval)) {
 		convert_to_long(&retval);
 		error = Z_LVAL(retval);
 		zval_ptr_dtor(&retval);
+	} else {
+		error = 0;
 	}
 
 	zval_ptr_dtor(&argv[0]);
-	zval_ptr_dtor(&argv[1]);
-	zval_ptr_dtor(&argv[2]); // ?
+//	zval_ptr_dtor(&argv[1]);
+//	zval_ptr_dtor(&argv[2]); // ?
+	return error;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_tree_walk, 0, 0, 2)
@@ -124,11 +126,10 @@ ZEND_END_ARG_INFO()
 
 static PHP_METHOD(Tree, walk) {
 	long mode;
-	zval **callback_data;
 	struct git2_treewalk_payload p;
 	p.this = getThis();
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lfZ", &mode, &p.callback_i, &p.callback_ic, &callback_data) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lf|z", &mode, &p.callback_i, &p.callback_ic, &p.callback_data) != SUCCESS) {
 		return;
 	}
 

git2_tree_entry.c

@@ -7,6 +7,7 @@ static zend_object_handlers php_git2_tree_entry_handler;
 typedef struct _git2_tree_entry_object {
 	zend_object std;
 	git_tree_entry *e;
+	zend_bool readonly;
 } git2_tree_entry_object_t;
 
 #define GIT2_TREE_ENTRY_FETCH() git2_tree_entry_object_t *intern = (git2_tree_entry_object_t*)Z_OBJ_P(getThis()); \
@@ -49,13 +50,24 @@ GIT2_TREE_ENTRY_GET_LONG(type)
 GIT2_TREE_ENTRY_GET_LONG(filemode)
 GIT2_TREE_ENTRY_GET_LONG(filemode_raw)
 
+zend_object *php_git2_tree_entry_create_object(zend_class_entry *class_type TSRMLS_DC);
 
 void git2_tree_entry_spawn(zval *return_value, git_tree_entry *e TSRMLS_DC) {
 	git2_tree_entry_object_t *intern;
 
 	object_init_ex(return_value, php_git2_tree_entry_ce);
 	intern = (git2_tree_entry_object_t*)Z_OBJ_P(return_value);
 	intern->e = e;
+	intern->readonly = 0;
+}
+
+void git2_tree_entry_spawn_ephemeral(zval *return_value, const git_tree_entry *e TSRMLS_DC) {
+	git2_tree_entry_object_t *intern;
+
+	object_init_ex(return_value, php_git2_tree_entry_ce);
+	intern = (git2_tree_entry_object_t*)Z_OBJ_P(return_value);
+	intern->e = e;
+	intern->readonly = 1;
 }
 
 zend_object *php_git2_tree_entry_create_object(zend_class_entry *class_type TSRMLS_DC) {
@@ -77,7 +89,7 @@ static void php_git2_tree_entry_free_object(zend_object *object TSRMLS_DC) {
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 
-	if (intern->e) {
+	if ((intern->e) && (!intern->readonly)) {
 		git_tree_entry_free(intern->e);
 		intern->e = NULL;
 	}

git2_tree_entry.h

@@ -4,5 +4,6 @@
 void git2_tree_entry_init(TSRMLS_DC);
 
 void git2_tree_entry_spawn(zval *return_value, git_tree_entry *e TSRMLS_DC);
+void git2_tree_entry_spawn_ephemeral(zval *return_value, const git_tree_entry *e TSRMLS_DC);
 
 #endif /* GIT2_TREE_ENTRY_H */

php_git2.c

@@ -8,6 +8,7 @@
 #include "git2_commit.h"
 #include "git2_remote.h"
 #include "git2_tree.h"
+#include "git2_tree_entry.h"
 
 static zend_class_entry *php_git2_base_ce;
 static zend_object_handlers php_git2_base_handler;
@@ -71,14 +72,15 @@ PHP_MINIT_FUNCTION(git2) {
 	GIT2_BASE_CONST(OBJ_BLOB);
 	GIT2_BASE_CONST(OBJ_ANY);
 
-	git2_exception_init(TSRMLS_CC);
-	git2_repository_init(TSRMLS_CC);
-	git2_config_init(TSRMLS_CC);
-	git2_config_entry_init(TSRMLS_CC);
-	git2_reference_init(TSRMLS_CC);
-	git2_commit_init(TSRMLS_CC);
-	git2_remote_init(TSRMLS_CC);
-	git2_tree_init(TSRMLS_CC);
+	git2_exception_init(TSRMLS_C);
+	git2_repository_init(TSRMLS_C);
+	git2_config_init(TSRMLS_C);
+	git2_config_entry_init(TSRMLS_C);
+	git2_reference_init(TSRMLS_C);
+	git2_commit_init(TSRMLS_C);
+	git2_remote_init(TSRMLS_C);
+	git2_tree_init(TSRMLS_C);
+	git2_tree_entry_init(TSRMLS_C);
 
 	return SUCCESS;
 }