openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 25967bbc: Merge "libsparse: use strcmp and validate last_used pointer" 

* commit '25967bbccbe108a91e65247427261017b2474962':
  libsparse: use strcmp and validate last_used pointer
This commit is contained in:
Mark Salyzyn 2015-08-21 14:30:51 +00:00 committed by Android Git Automerger
parent 0ee72c10ee 25967bbccb
commit 64f4adbadf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsparse/backed_block.c
View File

@ -221,7 +221,8 @@ static int merge_bb(struct backed_block_list *bbl,
}
break;
case BACKED_BLOCK_FILE:
if (a->file.filename != b->file.filename ||
/* Already make sure b->type is BACKED_BLOCK_FILE */
if (strcmp(a->file.filename, b->file.filename) ||
a->file.offset + a->len != b->file.offset) {
return -EINVAL;
}
@ -279,7 +280,10 @@ static int queue_bb(struct backed_block_list *bbl, struct backed_block *new_bb)
}
merge_bb(bbl, new_bb, new_bb->next);
merge_bb(bbl, bb, new_bb);
if (!merge_bb(bbl, bb, new_bb)) {
/* new_bb destroyed, point to retained as last_used */
bbl->last_used = bb;
}
return 0;
}