yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move memory_overlap() around from mem_map() to mem_map_check(). this fixes test_mem_map.c in issue #420

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2016-02-11 17:53:51 +08:00
parent 07e8f2f60d
commit 5719481e3f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
uc.c
View File

@ -622,10 +622,6 @@ static uc_err mem_map(uc_engine *uc, uint64_t address, size_t size, uint32_t per
{ {
MemoryRegion **regions; MemoryRegion **regions;
// this area overlaps existing mapped regions?
if (memory_overlap(uc, address, size))
return UC_ERR_MAP;
if (block == NULL) if (block == NULL)
return UC_ERR_NOMEM; return UC_ERR_NOMEM;
@ -666,6 +662,11 @@ static uc_err mem_map_check(uc_engine *uc, uint64_t address, size_t size, uint32
if ((perms & ~UC_PROT_ALL) != 0) if ((perms & ~UC_PROT_ALL) != 0)
return UC_ERR_ARG; return UC_ERR_ARG;
// this area overlaps existing mapped regions?
if (memory_overlap(uc, address, size)) {
return UC_ERR_MAP;
}
return UC_ERR_OK; return UC_ERR_OK;
} }