From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 Nov 2009 09:06:09 +0000 (+0000)
Subject: Assert that the indirect function wrapper exists if we encounter a
X-Git-Tag: svn/VALGRIND_3_6_0~471
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a4c610013ef1e5c1800cbe1626e5c5f58893e1a;p=thirdparty%2Fvalgrind.git

Assert that the indirect function wrapper exists if we encounter a
redirection for an indirect function.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10942
---

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 9eddc57b64..4dde33fe1f 100644
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -809,8 +809,10 @@ Addr VG_(redir_do_lookup) ( Addr orig, Bool* isWrap )
    vg_assert(r->to_addr != 0);
    if (isWrap)
       *isWrap = r->isWrap || r->isIFunc;
-   if (r->isIFunc)
+   if (r->isIFunc) {
+      vg_assert(iFuncWrapper);
       return iFuncWrapper;
+   }
    return r->to_addr;
 }