Skip to content

Fix leaks found by leak sanitizer. #93

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

Merged
matsumotory merged 1 commit into from
Mar 20, 2018
Merged

Fix leaks found by leak sanitizer. #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions src/mrb_redis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static mrb_value mrb_redis_connect(mrb_state *mrb, mrb_value self)

redisContext *rc = (redisContext *)DATA_PTR(self);
if (rc) {
mrb_free(mrb, rc);
redisFree(rc);
}
DATA_TYPE(self) = &redisContext_type;
DATA_PTR(self) = NULL;
Expand All @@ -178,6 +178,7 @@ static mrb_value mrb_redis_connect(mrb_state *mrb, mrb_value self)
}

if (rc->err) {
redisFree(rc);
mrb_raise(mrb, E_REDIS_ERROR, "redis connection failed.");
}

Expand Down Expand Up @@ -729,7 +730,9 @@ static mrb_value mrb_redis_hmget(mrb_state *mrb, mrb_value self)
}
}
} else {
mrb_raise(mrb, E_ARGUMENT_ERROR, rr->str);
mrb_value msg = mrb_str_new_cstr(mrb, rr->str);
freeReplyObject(rr);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S", msg);
}

freeReplyObject(rr);
Expand Down Expand Up @@ -770,7 +773,9 @@ static mrb_value mrb_redis_hmset(mrb_state *mrb, mrb_value self)
if (rr->type == REDIS_REPLY_STATUS && rr != NULL) {
freeReplyObject(rr);
} else {
mrb_raise(mrb, E_ARGUMENT_ERROR, rr->str);
mrb_value msg = mrb_str_new_cstr(mrb, rr->str);
freeReplyObject(rr);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S", msg);
}

return self;
Expand Down Expand Up @@ -828,7 +833,9 @@ static mrb_value mrb_redis_mset(mrb_state *mrb, mrb_value self)
if (rr->type == REDIS_REPLY_STATUS && rr != NULL) {
freeReplyObject(rr);
} else {
mrb_raise(mrb, E_ARGUMENT_ERROR, rr->str);
mrb_value msg = mrb_str_new_cstr(mrb, rr->str);
freeReplyObject(rr);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "%S", msg);
}

return self;
Expand Down Expand Up @@ -881,7 +888,9 @@ static mrb_value mrb_redis_mget(mrb_state *mrb, mrb_value self)
}
}
} else {
mrb_raise(mrb, E_ARGUMENT_ERROR, rr->str);
char const *msg = rr->str;
freeReplyObject(rr);
mrb_raise(mrb, E_ARGUMENT_ERROR, msg);
}

freeReplyObject(rr);
Expand Down Expand Up @@ -1111,10 +1120,12 @@ static inline mrb_value mrb_redis_get_reply(redisReply *reply, mrb_state *mrb, c
if (rule->return_exception) {
return exc;
} else {
freeReplyObject(reply);
mrb_exc_raise(mrb, exc);
}
} break;
default:
freeReplyObject(reply);
mrb_raise(mrb, E_REDIS_ERROR, "unknown reply type");
}
}
Expand Down