Rev-parse: now capturing and reporting regex errors.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
diff --git a/src/revparse.c b/src/revparse.c
index 53cc7a3..98285f0 100644
--- a/src/revparse.c
+++ b/src/revparse.c
@@ -145,6 +145,7 @@ static int walk_ref_history(git_object **out, git_repository *repo, const char *
/* "@{-N}" form means walk back N checkouts. That means the HEAD log. */
if (refspeclen == 0 && !git__prefixcmp(reflogspec, "@{-")) {
regex_t regex;
+ int regex_error;
if (git__strtol32(&n, reflogspec+3, NULL, 0) < 0 ||
n < 1) {
@@ -155,7 +156,10 @@ static int walk_ref_history(git_object **out, git_repository *repo, const char *
git_reflog_read(&reflog, ref);
git_reference_free(ref);
- if (!regcomp(®ex, "checkout: moving from (.*) to .*", REG_EXTENDED)) {
+ regex_error = regcomp(®ex, "checkout: moving from (.*) to .*", REG_EXTENDED);
+ if (regex_error != 0) {
+ giterr_set_regex(®ex, regex_error);
+ } else {
regmatch_t regexmatches[2];
refloglen = git_reflog_entrycount(reflog);
@@ -173,6 +177,7 @@ static int walk_ref_history(git_object **out, git_repository *repo, const char *
}
}
}
+ regfree(®ex);
}
} else {
git_buf datebuf = GIT_BUF_INIT;
@@ -385,6 +390,7 @@ static int handle_caret_syntax(git_object **out, git_repository *repo, git_objec
if (!git_revwalk_new(&walk, repo)) {
git_oid oid;
regex_t preg;
+ int reg_error;
git_buf buf = GIT_BUF_INIT;
git_revwalk_sorting(walk, GIT_SORT_TIME);
@@ -393,7 +399,10 @@ static int handle_caret_syntax(git_object **out, git_repository *repo, git_objec
/* Extract the regex from the movement string */
git_buf_put(&buf, movement+2, strlen(movement)-3);
- if (!regcomp(&preg, git_buf_cstr(&buf), REG_EXTENDED)) {
+ reg_error = regcomp(&preg, git_buf_cstr(&buf), REG_EXTENDED);
+ if (reg_error != 0) {
+ giterr_set_regex(&preg, reg_error);
+ } else {
while(!git_revwalk_next(&oid, walk)) {
git_object *walkobj;
char str[41];
@@ -415,15 +424,15 @@ static int handle_caret_syntax(git_object **out, git_repository *repo, git_objec
git_object_free(walkobj);
}
}
+ if (retcode < 0) {
+ giterr_set(GITERR_REFERENCE, "Couldn't find a match for %s", movement);
+ }
regfree(&preg);
}
git_buf_free(&buf);
git_revwalk_free(walk);
}
- if (retcode < 0) {
- giterr_set(GITERR_REFERENCE, "Couldn't find a match for %s", movement);
- }
return retcode;
}
diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c
index 4c9eeb4..c069846 100644
--- a/tests-clar/refs/revparse.c
+++ b/tests-clar/refs/revparse.c
@@ -130,6 +130,8 @@ void test_refs_revparse__revwalk(void)
{
cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/not found in any commit}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/merge}"));
+ cl_git_fail(git_revparse_single(&g_obj, g_repo, "master^{/((}"));
+ cl_assert(strstr(git_lasterror(), "parentheses not balanced") != NULL);
test_object("master^{/anoth}", "5b5b025afb0b4c913b4c338a42934a3863bf3644");
test_object("master^{/Merge}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");