Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix error when check redis reply in redis backend #16

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix error when check redis reply in redis backend #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31708cd
fix error when check redis reply in redis backend
ideal Oct 27, 2015
4aea012
should return GIT_EINVALID instead of GITERR_INVALID if error occured
ideal Oct 27, 2015
5685952
remove duplicate call of git_reference_symbolic_target()
ideal Oct 27, 2015
06a45b7
clean up resources if redis auth failed
ideal Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions redis/hiredis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ int hiredis_odb_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_b

if (reply && reply->type == REDIS_REPLY_ARRAY) {
if (reply->element[0]->type != REDIS_REPLY_NIL &&
reply->element[0]->type != REDIS_REPLY_NIL) {
reply->element[1]->type != REDIS_REPLY_NIL) {
*type_p = (git_otype) atoi(reply->element[0]->str);
*len_p = (size_t) atoi(reply->element[1]->str);
error = GIT_OK;
Expand Down Expand Up @@ -155,7 +155,7 @@ int hiredis_odb_backend__read_prefix(git_oid *out_oid,

/* TODO prefix */
giterr_set_str(GITERR_ODB, "Redis odb doesn't not implement oid prefix lookup");
return GITERR_INVALID;
return GIT_EINVALID;
}

int hiredis_odb_backend__exists(git_odb_backend *_backend, const git_oid *oid)
Expand Down Expand Up @@ -380,7 +380,6 @@ int hiredis_refdb_backend__write(git_refdb_backend *_backend, const git_referenc
backend = (hiredis_refdb_backend *) _backend;

target = git_reference_target(ref);
symbolic_target = git_reference_symbolic_target(ref);

/* FIXME handle force correctly */

Expand Down Expand Up @@ -511,9 +510,12 @@ int git_odb_backend_hiredis(git_odb_backend **backend_out, const char* prefix, c
return GIT_ERROR;
}

if(password != NULL) {
if (password != NULL) {
reply = redisCommand(sharedConnection, "AUTH %s", password);
if (reply->type == REDIS_REPLY_ERROR) {
if (reply == NULL || reply->type == REDIS_REPLY_ERROR) {
freeReplyObject(reply);
redisFree(sharedConnection);
free(backend);
giterr_set_str(GITERR_REFERENCE, "Redis odb storage authentication with redis server failed");
return GIT_ERROR;
}
Expand Down Expand Up @@ -560,9 +562,12 @@ int git_refdb_backend_hiredis(git_refdb_backend **backend_out, const char* prefi
return GIT_ERROR;
}

if(password != NULL) {
if (password != NULL) {
reply = redisCommand(sharedConnection, "AUTH %s", password);
if (reply->type == REDIS_REPLY_ERROR) {
freeReplyObject(reply);
redisFree(sharedConnection);
free(backend);
giterr_set_str(GITERR_REFERENCE, "Redis refdb storage authentication with redis server failed");
return GIT_ERROR;
}
Expand Down