From 45c01cd45fde155a91bcfe3533437946afa041ad Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 10 Feb 2009 17:03:19 -0800 Subject: [PATCH] Remove assert depending on confluence of guesses without anomaly. --- libdwfl/ChangeLog | 5 +++++ libdwfl/link_map.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index ba946c281..fb235c93e 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2009-02-10 Roland McGrath + + * link_map.c (consider_executable): Don't assert dwfl_addrsegment + finds our module. We shouldn't crash when we confuse some guesses. + 2009-02-10 Ulrich Drepper * open.c (decompress): Avoid crash with empty input file. diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c index e98903846..30fb445ab 100644 --- a/libdwfl/link_map.c +++ b/libdwfl/link_map.c @@ -1,5 +1,5 @@ /* Report modules by examining dynamic linker data structures. - Copyright (C) 2008 Red Hat, Inc. + Copyright (C) 2008, 2009 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -561,9 +561,7 @@ consider_executable (Dwfl_Module *mod, GElf_Addr at_phdr, GElf_Addr at_entry, void *buffer = NULL; size_t buffer_available = addrsize (ehdr.e_ident[EI_CLASS]); - Dwfl_Module *m; - int segndx = INTUSE(dwfl_addrsegment) (mod->dwfl, d_val_vaddr, &m); - assert (m == mod); + int segndx = INTUSE(dwfl_addrsegment) (mod->dwfl, d_val_vaddr, NULL); if ((*memory_callback) (mod->dwfl, segndx, &buffer, &buffer_available, -- 2.47.3