Skip to content

Fix memory leaks and improve error code path #6

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

Open
charignon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix memory leaks and improve error code path #6

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
38 changes: 16 additions & 22 deletions ext/gnista/gnista.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ typedef struct instance_hashreader {

VALUE GnistaException = Qnil;

static void cleanup_keybuf_valuebuf_logiter(uint8_t *keybuf, uint8_t *valuebuf, sparkey_logiter **logiterp) {
free(keybuf);
free(valuebuf);
sparkey_logiter_close(logiterp);
}

static void raise_sparkey(sparkey_returncode returncode) {
const char *error_msg = sparkey_errstring(returncode);
rb_raise(GnistaException, "%s", error_msg);
Expand Down Expand Up @@ -254,12 +260,10 @@ static VALUE method_logreader_each(VALUE self) {
returncode = sparkey_logiter_fill_key(logiter, i_logreader->logreader, wanted_keylen, keybuf, &actual_keylen);

if (returncode != SPARKEY_SUCCESS) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
raise_sparkey(returncode);
} else if (wanted_keylen != actual_keylen) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
rb_raise(GnistaException, "Corrupted read in logreader.");
}

Expand All @@ -269,12 +273,10 @@ static VALUE method_logreader_each(VALUE self) {
returncode = sparkey_logiter_fill_value(logiter, i_logreader->logreader, wanted_valuelen, valuebuf, &actual_valuelen);

if (returncode != SPARKEY_SUCCESS) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
raise_sparkey(returncode);
} else if (wanted_valuelen != actual_valuelen) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
rb_raise(GnistaException, "Corrupted read in logreader.");
}

Expand All @@ -284,9 +286,7 @@ static VALUE method_logreader_each(VALUE self) {
}
}

free(keybuf);
free(valuebuf);
sparkey_logiter_close(&logiter);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);

check_open(i_logreader->open);

Expand Down Expand Up @@ -434,12 +434,10 @@ static VALUE method_hash_each(VALUE self) {
returncode = sparkey_logiter_fill_key(logiter, sparkey_hash_getreader(i_hashreader->hashreader), wanted_keylen, keybuf, &actual_keylen);

if (returncode != SPARKEY_SUCCESS) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
raise_sparkey(returncode);
} else if (wanted_keylen != actual_keylen) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
rb_raise(GnistaException, "Corrupt entry in logreader.");
}

Expand All @@ -448,21 +446,17 @@ static VALUE method_hash_each(VALUE self) {
returncode = sparkey_logiter_fill_value(logiter, sparkey_hash_getreader(i_hashreader->hashreader), wanted_valuelen, valuebuf, &actual_valuelen);

if (returncode != SPARKEY_SUCCESS) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
raise_sparkey(returncode);
} else if (wanted_valuelen != actual_valuelen) {
free(keybuf);
free(valuebuf);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);
rb_raise(GnistaException, "Corrupt entry in logreader.");
}

rb_yield_values(2, rb_str_new((char *)keybuf, actual_keylen), rb_str_new((char *)valuebuf, actual_valuelen));
}

free(keybuf);
free(valuebuf);
sparkey_logiter_close(&logiter);
cleanup_keybuf_valuebuf_logiter(keybuf, valuebuf, &logiter);

check_open(i_hashreader->open);

Expand Down