Commit cab65c2b by nulltoken

revparse: detect incorrect "refname@{-n}" syntax

parent 1decf88b
...@@ -21,9 +21,10 @@ typedef enum { ...@@ -21,9 +21,10 @@ typedef enum {
REVPARSE_STATE_DONE, REVPARSE_STATE_DONE,
} revparse_state; } revparse_state;
static void set_invalid_syntax_err(const char *spec) static int revspec_error(const char *revspec)
{ {
giterr_set(GITERR_INVALID, "Refspec '%s' is not valid.", spec); giterr_set(GITERR_INVALID, "Failed to parse revision specifier - Invalid pattern '%s'", revspec);
return -1;
} }
static int revparse_lookup_fully_qualifed_ref(git_object **out, git_repository *repo, const char*spec) static int revparse_lookup_fully_qualifed_ref(git_object **out, git_repository *repo, const char*spec)
...@@ -154,21 +155,19 @@ static int walk_ref_history(git_object **out, git_repository *repo, const char * ...@@ -154,21 +155,19 @@ static int walk_ref_history(git_object **out, git_repository *repo, const char *
size_t reflogspeclen = strlen(reflogspec); size_t reflogspeclen = strlen(reflogspec);
if (git__prefixcmp(reflogspec, "@{") != 0 || if (git__prefixcmp(reflogspec, "@{") != 0 ||
git__suffixcmp(reflogspec, "}") != 0) { git__suffixcmp(reflogspec, "}") != 0)
giterr_set(GITERR_INVALID, "Bad reflogspec '%s'", reflogspec); return revspec_error(reflogspec);
return GIT_ERROR;
}
/* "@{-N}" form means walk back N checkouts. That means the HEAD log. */ /* "@{-N}" form means walk back N checkouts. That means the HEAD log. */
if (refspeclen == 0 && !git__prefixcmp(reflogspec, "@{-")) { if (!git__prefixcmp(reflogspec, "@{-")) {
regex_t regex; regex_t regex;
int regex_error; int regex_error;
if (git__strtol32(&n, reflogspec+3, NULL, 0) < 0 || if (refspeclen > 0)
n < 1) { return revspec_error(reflogspec);
giterr_set(GITERR_INVALID, "Invalid reflogspec %s", reflogspec);
return GIT_ERROR; if (git__strtol32(&n, reflogspec+3, NULL, 0) < 0 || n < 1)
} return revspec_error(reflogspec);
if (!git_reference_lookup(&ref, repo, "HEAD")) { if (!git_reference_lookup(&ref, repo, "HEAD")) {
if (!git_reflog_read(&reflog, ref)) { if (!git_reflog_read(&reflog, ref)) {
...@@ -373,10 +372,8 @@ static int handle_caret_syntax(git_object **out, git_repository *repo, git_objec ...@@ -373,10 +372,8 @@ static int handle_caret_syntax(git_object **out, git_repository *repo, git_objec
int n; int n;
if (*movement == '{') { if (*movement == '{') {
if (movement[movementlen-1] != '}') { if (movement[movementlen-1] != '}')
set_invalid_syntax_err(movement); return revspec_error(movement);
return GIT_ERROR;
}
/* {} -> Dereference until we reach an object that isn't a tag. */ /* {} -> Dereference until we reach an object that isn't a tag. */
if (movementlen == 2) { if (movementlen == 2) {
......
...@@ -133,6 +133,7 @@ void test_refs_revparse__reflog(void) ...@@ -133,6 +133,7 @@ void test_refs_revparse__reflog(void)
{ {
cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-xyz}")); cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-xyz}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-0}")); cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{-0}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{-2}"));
cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{1000}")); cl_git_fail(git_revparse_single(&g_obj, g_repo, "@{1000}"));
test_object("nope@{0}", NULL); test_object("nope@{0}", NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment