Skip to content

Fix off-by-one in label/key malloc — missing NUL terminator #374

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
aaranmcguire wants to merge 1 commit into
base: dev
Choose a base branch
from
+10 −6
Open

Fix off-by-one in label/key malloc — missing NUL terminator #374

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
16 changes: 10 additions & 6 deletions src/readstat_writer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,14 @@ static void readstat_label_set_free(readstat_label_set_t *label_set) {
free(label_set);
}

static void readstat_copy_label(readstat_value_label_t *value_label, const char *label) {
static readstat_error_t readstat_copy_label(readstat_value_label_t *value_label, const char *label) {
if (label && strlen(label)) {
value_label->label_len = strlen(label);
value_label->label = malloc(value_label->label_len);
memcpy(value_label->label, label, value_label->label_len);
value_label->label = malloc(value_label->label_len + 1);
if (value_label->label == NULL) return READSTAT_ERROR_MALLOC;
memcpy(value_label->label, label, value_label->label_len + 1);
}
return READSTAT_OK;
}

static readstat_value_label_t *readstat_add_value_label(readstat_label_set_t *label_set, const char *label) {
Expand All @@ -91,7 +93,8 @@ static readstat_value_label_t *readstat_add_value_label(readstat_label_set_t *la
}
readstat_value_label_t *new_value_label = &label_set->value_labels[label_set->value_labels_count++];
memset(new_value_label, 0, sizeof(readstat_value_label_t));
readstat_copy_label(new_value_label, label);
if (readstat_copy_label(new_value_label, label) != READSTAT_OK)
return NULL;
return new_value_label;
}

Expand Down Expand Up @@ -355,8 +358,9 @@ void readstat_label_string_value(readstat_label_set_t *label_set, const char *va
readstat_value_label_t *new_value_label = readstat_add_value_label(label_set, label);
if (value && strlen(value)) {
new_value_label->string_key_len = strlen(value);
new_value_label->string_key = malloc(new_value_label->string_key_len);
memcpy(new_value_label->string_key, value, new_value_label->string_key_len);
new_value_label->string_key = malloc(new_value_label->string_key_len + 1);
if (new_value_label->string_key == NULL) return;
memcpy(new_value_label->string_key, value, new_value_label->string_key_len + 1);
}
}

Expand Down