Tweak order free things (avoids an 'samtools depad' seg fault on error)

[samtools.git] / padding.c

diff --git a/padding.c b/padding.c
index 88945e2ca5c54c1a592a45899358996ddd810ece..fbbb204421f16dfcb6434053d6ef85e729086272 100644 (file)
--- a/padding.c
+++ b/padding.c
@@ -271,6 +271,31 @@ int bam_pad2unpad(samfile_t *in, samfile_t *out, faidx_t *fai)
                        n2 = k;
                        replace_cigar(b, n2, cigar2);
                        b->core.pos = posmap[b->core.pos];
+                       if (b->core.mpos < 0) {
+                               /* Nice case, no mate to worry about*/
+                       } else if (b->core.mtid == b->core.tid) {
+                               /* Nice case, same reference */
+                               b->core.mpos = posmap[b->core.mpos];
+                       } else {
+                               /* Nasty case, Must load alternative posmap */
+                               if (!fai) {
+                                       fprintf(stderr, "[depad] ERROR: Needed reference %s sequence for mate (and no FASTA file)\n", h->target_name[b->core.mtid]);
+                                       return -1;
+                               }
+                               /* Temporarily load the other reference sequence */
+                               if (load_unpadded_ref(fai, h->target_name[b->core.mtid], h->target_len[b->core.mtid], &r)) {
+                                       fprintf(stderr, "[depad] ERROR: Failed to load '%s' from reference FASTA\n", h->target_name[b->core.mtid]);
+                                       return -1;
+                               }
+                               posmap = update_posmap(posmap, r);
+                               b->core.mpos = posmap[b->core.mpos];
+                               /* Restore the reference and posmap*/
+                               if (load_unpadded_ref(fai, h->target_name[b->core.tid], h->target_len[b->core.tid], &r)) {
+                                       fprintf(stderr, "[depad] ERROR: Failed to load '%s' from reference FASTA\n", h->target_name[b->core.tid]);
+                                       return -1;
+                               }
+                               posmap = update_posmap(posmap, r);
+                       }
                }
                samwrite(out, b);
        }
@@ -330,7 +355,7 @@ bam_header_t * fix_header(bam_header_t *old, faidx_t *fai)
        if (strlen(header->text) < header->l_text) {
                //fprintf(stderr, "[depad] Reallocating header buffer\n");
                assert (newtext == header->text);
-               newtext = calloc(strlen(header->text) + 1, 1);
+               newtext = malloc(strlen(header->text) + 1);
                strcpy(newtext, header->text);
                free(header->text);
                header->text = newtext;
@@ -414,11 +439,11 @@ int main_pad2unpad(int argc, char *argv[])
 
 depad_end:
        // close files, free and return
-       free(fn_list); free(fn_out);
-        if (h != in->header) bam_header_destroy(h);
+       if (fai) fai_destroy(fai);
+       if (h != in->header) bam_header_destroy(h);
        samclose(in);
        samclose(out);
-       fai_destroy(fai);
+       free(fn_list); free(fn_out);
        return ret;
 }