zzh
/
minimap2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix deserialization of zero-length reference names

This commit is contained in:
Ilya Kolpakov 2018-06-06 23:04:59 +02:00 committed by Heng Li
parent 57f37551f8
commit 408e098859
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
index.c
View File

@ -420,9 +420,14 @@ void mm_idx_dump(FILE *fp, const mm_idx_t *mi)
fwrite(MM_IDX_MAGIC, 1, 4, fp); fwrite(MM_IDX_MAGIC, 1, 4, fp);
fwrite(x, 4, 5, fp); fwrite(x, 4, 5, fp);
for (i = 0; i < mi->n_seq; ++i) { for (i = 0; i < mi->n_seq; ++i) {
uint8_t l = mi->seq[i].name ? strlen(mi->seq[i].name) : 0; if (mi->seq[i].name) {
fwrite(&l, 1, 1, fp); uint8_t l = strlen(mi->seq[i].name);
fwrite(mi->seq[i].name, 1, l, fp); fwrite(&l, 1, 1, fp);
fwrite(mi->seq[i].name, 1, l, fp);
} else {
uint8_t l = 0;
fwrite(&l, 1, 1, fp);
}
fwrite(&mi->seq[i].len, 4, 1, fp); fwrite(&mi->seq[i].len, 4, 1, fp);
sum_len += mi->seq[i].len; sum_len += mi->seq[i].len;
} }
@ -465,9 +470,11 @@ mm_idx_t *mm_idx_load(FILE *fp)
uint8_t l; uint8_t l;
mm_idx_seq_t *s = &mi->seq[i]; mm_idx_seq_t *s = &mi->seq[i];
fread(&l, 1, 1, fp); fread(&l, 1, 1, fp);
s->name = (char*)kmalloc(mi->km, l + 1); if (l) {
fread(s->name, 1, l, fp); s->name = (char*)kmalloc(mi->km, l + 1);
s->name[l] = 0; fread(s->name, 1, l, fp);
s->name[l] = 0;
}
fread(&s->len, 4, 1, fp); fread(&s->len, 4, 1, fp);
s->offset = sum_len; s->offset = sum_len;
sum_len += s->len; sum_len += s->len;