From a9c688ac923ea63c14f4a9dbf74a4aedb4d65459 Mon Sep 17 00:00:00 2001 From: Heng Li Date: Mon, 31 Jul 2017 07:55:35 -0400 Subject: [PATCH] r1181: fixed a segfault (#145) due to (#138) --- bwamem.c | 2 +- main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bwamem.c b/bwamem.c index 69be769..d7c00fe 100644 --- a/bwamem.c +++ b/bwamem.c @@ -905,7 +905,7 @@ void mem_aln2sam(const mem_opt_t *opt, const bntseq_t *bns, kstring_t *str, bseq kputsn("\tNM:i:", 6, str); kputw(p->NM, str); kputsn("\tMD:Z:", 6, str); kputs((char*)(p->cigar + p->n_cigar), str); } - if (m->n_cigar) { kputsn("\tMC:Z:", 6, str); add_cigar(opt, m, str, which); } + if (m && m->n_cigar) { kputsn("\tMC:Z:", 6, str); add_cigar(opt, m, str, which); } if (p->score >= 0) { kputsn("\tAS:i:", 6, str); kputw(p->score, str); } if (p->sub >= 0) { kputsn("\tXS:i:", 6, str); kputw(p->sub, str); } if (bwa_rg_id[0]) { kputsn("\tRG:Z:", 6, str); kputs(bwa_rg_id, str); } diff --git a/main.c b/main.c index 21bff9b..e2b7cf1 100644 --- a/main.c +++ b/main.c @@ -4,7 +4,7 @@ #include "utils.h" #ifndef PACKAGE_VERSION -#define PACKAGE_VERSION "0.7.16-r1180" +#define PACKAGE_VERSION "0.7.16a-r1181" #endif int bwa_fa2pac(int argc, char *argv[]);