Merge branch 'mem_fuzzing' of https://github.com/eqv/unicorn into eqv-mem_fuzzing

This commit is contained in:
Nguyen Anh Quynh 2016-02-12 00:36:42 +08:00
commit 2ef30fc2d0

View file

@ -85,7 +85,7 @@ void memory_unmap(struct uc_struct *uc, MemoryRegion *mr)
if (uc->mapped_blocks[i] == mr) {
uc->mapped_block_count--;
//shift remainder of array down over deleted pointer
memcpy(&uc->mapped_blocks[i], &uc->mapped_blocks[i + 1], sizeof(MemoryRegion*) * (uc->mapped_block_count - i));
memmove(&uc->mapped_blocks[i], &uc->mapped_blocks[i + 1], sizeof(MemoryRegion*) * (uc->mapped_block_count - i));
mr->destructor(mr);
g_free((char *)mr->name);
g_free(mr->ioeventfds);