diff options
| author | David Blaikie <dblaikie@gmail.com> | 2014-04-29 21:52:46 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2014-04-29 21:52:46 +0000 |
| commit | 00121bb932ddbf026297f357c2d3cdf1414f628a (patch) | |
| tree | 4a34633b0177e892b2b20a8753d10ffae4025eb0 /include/llvm | |
| parent | 2387e9ecb164b00f0802697bd667a59fb5295626 (diff) | |
| download | llvm-00121bb932ddbf026297f357c2d3cdf1414f628a.tar.gz llvm-00121bb932ddbf026297f357c2d3cdf1414f628a.tar.bz2 llvm-00121bb932ddbf026297f357c2d3cdf1414f628a.tar.xz | |
PR19553: Memory leak in RuntimeDyldELF::createObjectImageFromFile
This starts in MCJIT::getSymbolAddress where the
unique_ptr<object::Binary> is release()d and (after a cast) passed to a
single caller, MCJIT::addObjectFile.
addObjectFile calls RuntimeDyld::loadObject.
RuntimeDld::loadObject calls RuntimeDyldELF::createObjectFromFile
And the pointer is never owned at this point. I say this point, because
the alternative codepath, RuntimeDyldMachO::createObjectFile certainly
does take ownership, so this seemed like a good hint that this was a/the
right place to take ownership.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207580 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
| -rw-r--r-- | include/llvm/ExecutionEngine/ExecutionEngine.h | 2 | ||||
| -rw-r--r-- | include/llvm/ExecutionEngine/RuntimeDyld.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h index 70440d725d..07a04154cd 100644 --- a/include/llvm/ExecutionEngine/ExecutionEngine.h +++ b/include/llvm/ExecutionEngine/ExecutionEngine.h @@ -222,7 +222,7 @@ public: /// needed by another object. /// /// MCJIT will take ownership of the ObjectFile. - virtual void addObjectFile(object::ObjectFile *O) { + virtual void addObjectFile(std::unique_ptr<object::ObjectFile> O) { llvm_unreachable( "ExecutionEngine subclass doesn't implement addObjectFile."); } diff --git a/include/llvm/ExecutionEngine/RuntimeDyld.h b/include/llvm/ExecutionEngine/RuntimeDyld.h index 8d7b81bb6e..30c0d49ade 100644 --- a/include/llvm/ExecutionEngine/RuntimeDyld.h +++ b/include/llvm/ExecutionEngine/RuntimeDyld.h @@ -55,7 +55,7 @@ public: /// Ownership of the input object is transferred to the ObjectImage /// instance returned from this function if successful. In the case of load /// failure, the input object will be deleted. - ObjectImage *loadObject(object::ObjectFile *InputObject); + ObjectImage *loadObject(std::unique_ptr<object::ObjectFile> InputObject); /// Get the address of our local copy of the symbol. This may or may not /// be the address used for relocation (clients can copy the data around |