diff options
| author | Ben Straub <bstraub@github.com> | 2012-06-19 21:11:48 -0700 |
|---|---|---|
| committer | Ben Straub <bstraub@github.com> | 2012-06-19 21:11:48 -0700 |
| commit | eb6bc45f6db0de0a445c09d2c7f5c2eaa3669103 (patch) | |
| tree | be8762a64e8368dafa425559107302736fba0a4c | |
| parent | 1d94a7d0f6c8cb0d1fcf288a1734a7a5abd1b094 (diff) | |
| download | libgit2-eb6bc45f6db0de0a445c09d2c7f5c2eaa3669103.tar.gz | |
Avoid uninitialized variable error.
| -rw-r--r-- | src/revparse.c | 4 | ||||
| -rw-r--r-- | tests-clar/refs/revparse.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/revparse.c b/src/revparse.c index c275b55a6..46abb0563 100644 --- a/src/revparse.c +++ b/src/revparse.c @@ -506,8 +506,8 @@ static int handle_linear_syntax(git_object **out, git_object *obj, const char *m /* "~" is the same as "~1" */ if (*movement == '\0') { n = 1; - } else { - git__strtol32(&n, movement, NULL, 0); + } else if (git__strtol32(&n, movement, NULL, 0) < 0) { + return GIT_ERROR; } commit1 = (git_commit*)obj; diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c index c303e1b5f..2ee72f206 100644 --- a/tests-clar/refs/revparse.c +++ b/tests-clar/refs/revparse.c @@ -104,6 +104,9 @@ void test_refs_revparse__to_type(void) void test_refs_revparse__linear_history(void) { + cl_git_fail(git_revparse_single(&g_obj, g_repo, "foo~bar")); + cl_git_fail(git_revparse_single(&g_obj, g_repo, "master~bar")); + test_object("master~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); test_object("master~1", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"); test_object("master~2", "9fd738e8f7967c078dceed8190330fc8648ee56a"); |