Skip to content

BUG: add missing checks for nullptr in mm_new(|_nan) #547

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
neutrinoceros wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

BUG: add missing checks for nullptr in mm_new(|_nan) #547

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: 15 additions & 1 deletion bottleneck/src/move_median/move_median.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,16 @@ static inline void mm_swap_heap_heads(mm_node **s_heap, idx_t n_s,
* heap). The handle, containing information about the heaps, is returned. */
mm_handle *
mm_new(const idx_t window, idx_t min_count) {
mm_handle *mm = malloc(sizeof(mm_handle));
mm_handle *mm = malloc(sizeof(mm_handle));
if (mm == NULL) return NULL;
mm->nodes = malloc(window * sizeof(mm_node*));
mm->node_data = malloc(window * sizeof(mm_node));
if (mm->nodes == NULL || mm->node_data == NULL) {
free(mm->node_data);
free(mm->nodes);
free(mm);
return NULL;
}

mm->s_heap = mm->nodes;
mm->l_heap = &mm->nodes[window / 2 + window % 2];
Expand Down Expand Up @@ -168,8 +175,15 @@ mm_update(mm_handle *mm, ai_t ai) {
mm_handle *
mm_new_nan(const idx_t window, idx_t min_count) {
mm_handle *mm = malloc(sizeof(mm_handle));
if (mm == NULL) return NULL;
mm->nodes = malloc(2 * window * sizeof(mm_node*));
mm->node_data = malloc(window * sizeof(mm_node));
if (mm->nodes == NULL || mm->node_data == NULL) {
free(mm->node_data);
free(mm->nodes);
free(mm);
return NULL;
}

mm->s_heap = mm->nodes;
mm->l_heap = &mm->nodes[window / 2 + window % 2];
Expand Down