Skip to content

Move misplaced NULL pointer checks #1992

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
jkbonfield merged 1 commit into from
Mar 26, 2026
+4 −15
Merged

Move misplaced NULL pointer checks #1992

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
19 changes: 4 additions & 15 deletions cram/cram_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2427,10 +2427,10 @@ static void ref_entry_free_seq(ref_entry *e) {
void refs_free(refs_t *r) {
RP("refs_free()\n");

if (--r->count > 0)
if (!r)
return;

if (!r)
if (--r->count > 0)
return;

if (r->pool)
Expand Down Expand Up @@ -3434,24 +3434,13 @@ char *cram_get_ref(cram_fd *fd, int id, hts_pos_t start, hts_pos_t end) {


/* Sanity checking: does this ID exist? */
if (id >= fd->refs->nref) {
hts_log_error("No reference found for id %d", id);
pthread_mutex_unlock(&fd->ref_lock);
return NULL;
}

if (!fd->refs || !fd->refs->ref_id[id]) {
hts_log_error("No reference found for id %d", id);
pthread_mutex_unlock(&fd->ref_lock);
return NULL;
}

if (!(r = fd->refs->ref_id[id])) {
if (!fd->refs || id < 0 || id >= fd->refs->nref || !fd->refs->ref_id[id]) {
hts_log_error("No reference found for id %d", id);
pthread_mutex_unlock(&fd->ref_lock);
return NULL;
}

r = fd->refs->ref_id[id];

/*
* It has an entry, but may not have been populated yet.
Expand Down
Loading