commit e6b4a16ddd2192bbe324693ca8d43712c2c587a0
author Benjamin Kramer <benny.kra@googlemail.com> Tue Mar 20 20:18:13 2012 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Tue Mar 20 20:18:13 2012 +0000
tree 48e5bbfcad8e4c7b5ee3795db7c5966f01b07ed4
parent 40ca00dc4ccb1e5466fde745a99853d9df0c67aa

Fix a use-after-free in thunk emission. EmitThunk may call RAUW on Init, invalidating the pointer.

Fixes PR12284. The test case only triggered under asan/valgrind, but it's better than nothing.

llvm-svn: 153120

clang/lib/CodeGen/CGVTables.cpp

diff --git a/clang/lib/CodeGen/CGVTables.cpp b/clang/lib/CodeGen/CGVTables.cpp
index e262de1..17a0537 100644
--- a/clang/lib/CodeGen/CGVTables.cpp
+++ b/clang/lib/CodeGen/CGVTables.cpp
@@ -584,8 +584,8 @@
             VTableThunks[NextVTableThunkIndex].first == I) {
           const ThunkInfo &Thunk = VTableThunks[NextVTableThunkIndex].second;
         
-          Init = CGM.GetAddrOfThunk(GD, Thunk);
           MaybeEmitThunkAvailableExternally(GD, Thunk);
+          Init = CGM.GetAddrOfThunk(GD, Thunk);
 
           NextVTableThunkIndex++;
         } else {