[llvm-branch-commits] [llvm-branch] r118523 - /llvm/branches/Apple/whitney/lib/VMCore/InlineAsm.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov  9 11:28:04 2010
New Revision: 118523

URL: http://llvm.org/viewvc/llvm-project?rev=118523&view=rev
Log:
Merge r118030:
--
Author: Dale Johannesen <dalej at apple.com>
Date:   Tue Nov 2 17:59:27 2010 +0000

    Apply patch for use-after-free in InlineAsm constant handling,
    PR 8522 / 8616046.  Test reduction, analysis and patch by Tim Deegan!
    (However, review by someone who understands the classes here better
    is welcome.  John Krum will return!)

Modified:
    llvm/branches/Apple/whitney/lib/VMCore/InlineAsm.cpp

Modified: llvm/branches/Apple/whitney/lib/VMCore/InlineAsm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/VMCore/InlineAsm.cpp?rev=118523&r1=118522&r2=118523&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/VMCore/InlineAsm.cpp (original)
+++ llvm/branches/Apple/whitney/lib/VMCore/InlineAsm.cpp Tue Nov  9 11:28:04 2010
@@ -47,6 +47,7 @@
 }
 
 void InlineAsm::destroyConstant() {
+  getRawType()->getContext().pImpl->InlineAsms.remove(this);
   delete this;
 }