From 4c1325e88bdf852ddaae4c41104ef3a9ce325693 Mon Sep 17 00:00:00 2001
From: Damien Lelievre <damien.lelievre@kitpages.fr>
Date: Wed, 10 Sep 2014 22:01:31 +0200
Subject: [PATCH 1/2] git_commit_create: allow NULL parameter for update_ref
---
commit.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/commit.c b/commit.c
index 1f38036672..1ecf768c52 100644
--- a/commit.c
+++ b/commit.c
@@ -409,14 +409,14 @@ PHP_FUNCTION(git_commit_nth_gen_ancestor)
/* }}} */
/* {{{ proto resource git_commit_create(
- resource $repo, string $update_ref, array $author, array $committer,
+ resource $repo, mixed $update_ref, array $author, array $committer,
string $message_encoding, string $message, resource $tree, array $parents)
*/
PHP_FUNCTION(git_commit_create)
{
- zval *repo, *tree, *parents, *committer, *author, **element;
- char *update_ref = {0}, *message_encoding = {0}, *message = {0};
- int update_ref_len, message_encoding_len, message_len, parent_count = 0, error = 0, i;
+ zval *repo, *tree, *parents, *committer, *author, *update_ref, **element;
+ char *message_encoding = {0}, *message = {0};
+ int message_encoding_len, message_len, parent_count = 0, error = 0, i;
php_git2_t *_repo, *_tree;
git_signature __author, __committer;
char out[GIT2_OID_HEXSIZE] = {0};
@@ -425,12 +425,19 @@ PHP_FUNCTION(git_commit_create)
HashPosition pos;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
- "rsaassra", &repo, &update_ref, &update_ref_len, &author,
+ "rzaassra", &repo, &update_ref, &author,
&committer, &message_encoding, &message_encoding_len, &message,
&message_len, &tree, &parents) == FAILURE) {
return;
}
+ /**
+ * Check update_ref type
+ */
+ if(Z_TYPE_P(update_ref) != IS_STRING && Z_TYPE_P(update_ref) != IS_NULL) {
+ return;
+ }
+
memset(&__author, '\0', sizeof(git_signature));
memset(&__committer, '\0', sizeof(git_signature));
@@ -468,7 +475,7 @@ PHP_FUNCTION(git_commit_create)
error = git_commit_create(
&oid,
PHP_GIT2_V(_repo, repository),
- update_ref,
+ Z_TYPE_P(update_ref) == IS_STRING ? Z_STRVAL_P(update_ref) : NULL,
&__author,
&__committer,
message_encoding,
From 0c8dcbf0536b5ffa0d0a23105444f1d51d4d5c84 Mon Sep 17 00:00:00 2001
From: Damien Lelievre <damien.lelievre@kitpages.fr>
Date: Wed, 10 Sep 2014 22:53:30 +0200
Subject: [PATCH 2/2] (+header) git_commit_create: allow NULL parameter for
update_ref
---
commit.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commit.h b/commit.h
index fd3af615a8..34e1fb8a9a 100644
--- a/commit.h
+++ b/commit.h
@@ -192,7 +192,7 @@ PHP_FUNCTION(git_commit_parent_id);
PHP_FUNCTION(git_commit_nth_gen_ancestor);
/* {{{ proto resource git_commit_create(
- resource $repo, string $update_ref, array $author, array $committer,
+ resource $repo, mixed $update_ref, array $author, array $committer,
string $message_encoding, string $message, resource $tree, array $parents)
*/
PHP_FUNCTION(git_commit_create);