|
From: <sv...@va...> - 2011-09-10 11:25:13
|
Author: sewardj
Date: 2011-09-10 12:20:26 +0100 (Sat, 10 Sep 2011)
New Revision: 12023
Log:
ML_(read_elf_debug_info): if we exit from this routine via the BAD
macro, set di->soname back to NULL, so that if we later reenter with
the same 'di', we don't fall over the initial di->soname == NULL
assertion.
Modified:
trunk/coregrind/m_debuginfo/readelf.c
Modified: trunk/coregrind/m_debuginfo/readelf.c
===================================================================
--- trunk/coregrind/m_debuginfo/readelf.c 2011-09-10 10:17:35 UTC (rev 12022)
+++ trunk/coregrind/m_debuginfo/readelf.c 2011-09-10 11:20:26 UTC (rev 12023)
@@ -1559,6 +1559,10 @@
do { ML_(symerr)(di, True, \
"Can't make sense of " _secname \
" section mapping"); \
+ /* make sure we don't assert if we find */ \
+ /* ourselves back in this routine later, */ \
+ /* with the same di */ \
+ di->soname = NULL; \
goto out; \
} while (0)
|