R/rmodb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NULL guard pointers

Browse Source
This commit is contained in:
Craig Williams
2020-10-08 10:18:30 +01:00
parent 27ffe3177f
commit 6035772774
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/db_column.c
View File

@@ -241,14 +241,18 @@ void freeColumn(struct column_data_t *col)
for (unsigned int r = 0; r < col->n_values; r++) { for (unsigned int r = 0; r < col->n_values; r++) {
if (!columnRowIsNull(col, r)) { if (!columnRowIsNull(col, r)) {
if (col->type == TYPE_STRING) { if (col->type == TYPE_STRING) {
if (*(col->data.ptr_str + r) != 0) {
free(*(col->data.ptr_str + r)); free(*(col->data.ptr_str + r));
*(col->data.ptr_str + r) = 0; *(col->data.ptr_str + r) = 0;
}
} else { } else {
if (*(col->data.ptr_blob + r) != 0) {
free(*(col->data.ptr_blob + r)); free(*(col->data.ptr_blob + r));
*(col->data.ptr_blob + r) = 0; *(col->data.ptr_blob + r) = 0;
} }
} }
} }
}
free(col->data_lens); free(col->data_lens);
col->data_lens = 0; col->data_lens = 0;