X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bam_index.c;h=328f011c16ccf4a9a558702317ecdecfbcc5212a;hb=5f5ed2477797cbd8b0c3cdd16d8abbaa2319d300;hp=9d819d33aa30677384c2d1bdd97639a206f04003;hpb=8ad43dd70c21cfdd6a965a528363511b52d25c5f;p=samtools.git

diff --git a/bam_index.c b/bam_index.c
index 9d819d3..328f011 100644
--- a/bam_index.c
+++ b/bam_index.c
@@ -212,7 +212,7 @@ bam_index_t *bam_index_core(bamFile fp)
 	}
 	if (save_tid >= 0) {
 		insert_offset(idx->index[save_tid], save_bin, save_off, bam_tell(fp));
-		insert_offset(idx->index[save_tid], BAM_MAX_BIN, off_beg, off_end);
+		insert_offset(idx->index[save_tid], BAM_MAX_BIN, off_beg, bam_tell(fp));
 		insert_offset(idx->index[save_tid], BAM_MAX_BIN, n_mapped, n_unmapped);
 	}
 	merge_chunks(idx);
@@ -608,6 +608,9 @@ bam_iter_t bam_iter_query(const bam_index_t *idx, int tid, int beg, int end)
 		}
 	}
 	free(bins);
+	if (n_off == 0) {
+		free(off); return iter;
+	}
 	{
 		bam1_t *b = (bam1_t*)calloc(1, sizeof(bam1_t));
 		int l;
@@ -656,17 +659,17 @@ void bam_iter_destroy(bam_iter_t iter)
 
 int bam_iter_read(bamFile fp, bam_iter_t iter, bam1_t *b)
 {
+	int ret;
 	if (iter && iter->finished) return -1;
 	if (iter == 0 || iter->from_first) {
-		int ret = bam_read1(fp, b);
+		ret = bam_read1(fp, b);
 		if (ret < 0 && iter) iter->finished = 1;
 		return ret;
 	}
 	if (iter->off == 0) return -1;
 	for (;;) {
-		int ret;
 		if (iter->curr_off == 0 || iter->curr_off >= iter->off[iter->i].v) { // then jump to the next chunk
-			if (iter->i == iter->n_off - 1) break; // no more chunks
+			if (iter->i == iter->n_off - 1) { ret = -1; break; } // no more chunks
 			if (iter->i >= 0) assert(iter->curr_off == iter->off[iter->i].v); // otherwise bug
 			if (iter->i < 0 || iter->off[iter->i].v != iter->off[iter->i+1].u) { // not adjacent chunks; then seek
 				bam_seek(fp, iter->off[iter->i+1].u, SEEK_SET);
@@ -676,21 +679,26 @@ int bam_iter_read(bamFile fp, bam_iter_t iter, bam1_t *b)
 		}
 		if ((ret = bam_read1(fp, b)) >= 0) {
 			iter->curr_off = bam_tell(fp);
-			if (b->core.tid != iter->tid || b->core.pos >= iter->end) break; // no need to proceed
+			if (b->core.tid != iter->tid || b->core.pos >= iter->end) { // no need to proceed
+				ret = bam_validate1(NULL, b)? -1 : -5; // determine whether end of region or error
+				break;
+			}
 			else if (is_overlap(iter->beg, iter->end, b)) return ret;
-		} else break; // end of file
+		} else break; // end of file or error
 	}
 	iter->finished = 1;
-	return -1;
+	return ret;
 }
 
 int bam_fetch(bamFile fp, const bam_index_t *idx, int tid, int beg, int end, void *data, bam_fetch_f func)
 {
+	int ret;
 	bam_iter_t iter;
 	bam1_t *b;
 	b = bam_init1();
 	iter = bam_iter_query(idx, tid, beg, end);
-	while (bam_iter_read(fp, iter, b) >= 0) func(b, data);
+	while ((ret = bam_iter_read(fp, iter, b)) >= 0) func(b, data);
+	bam_iter_destroy(iter);
 	bam_destroy1(b);
-	return 0;
+	return (ret == -1)? 0 : ret;
 }