wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1082524 - Do not deref null pointers in link_map. r=nfroyd

Browse Source
This commit is contained in:
Mike Hommey 2014-10-18 09:27:55 +09:00
parent 329a5d00db
commit a6593e4218
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozglue/linker/ElfLoader.cpp
View File

@ -885,16 +885,18 @@ ElfLoader::DebuggerHelper::Remove(ElfLoader::link_map *map)
dbg->r_brk(); dbg->r_brk();
if (dbg->r_map == map) if (dbg->r_map == map)
dbg->r_map = map->l_next; dbg->r_map = map->l_next;
else else if (map->l_prev) {
map->l_prev->l_next = map->l_next; map->l_prev->l_next = map->l_next;
}
if (map == firstAdded) { if (map == firstAdded) {
firstAdded = map->l_prev; firstAdded = map->l_prev;
/* When removing the first added library, its l_next is going to be /* When removing the first added library, its l_next is going to be
* data handled by the system linker, and that data may be read-only */ * data handled by the system linker, and that data may be read-only */
EnsureWritable w(&map->l_next->l_prev); EnsureWritable w(&map->l_next->l_prev);
map->l_next->l_prev = map->l_prev; map->l_next->l_prev = map->l_prev;
} else } else if (map->l_next) {
map->l_next->l_prev = map->l_prev; map->l_next->l_prev = map->l_prev;
}
dbg->r_state = r_debug::RT_CONSISTENT; dbg->r_state = r_debug::RT_CONSISTENT;
dbg->r_brk(); dbg->r_brk();
} }