From: Ted Kremenek Date: Sun, 7 Nov 2010 06:09:02 +0000 (+0000) Subject: Fix memory leak in StringRef::edit_distance(). 'Allocated' could be leaked on an... X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=13302ec089d56b91f5d4b775910439ab9a74fd41;p=oota-llvm.git Fix memory leak in StringRef::edit_distance(). 'Allocated' could be leaked on an early return. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118370 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/StringRef.cpp b/lib/Support/StringRef.cpp index 5ad862815b5..d5fd12727db 100644 --- a/lib/Support/StringRef.cpp +++ b/lib/Support/StringRef.cpp @@ -9,6 +9,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/ADT/APInt.h" +#include "llvm/ADT/OwningPtr.h" #include using namespace llvm; @@ -84,10 +85,12 @@ unsigned StringRef::edit_distance(llvm::StringRef Other, const unsigned SmallBufferSize = 64; unsigned SmallBuffer[SmallBufferSize]; - unsigned *Allocated = 0; + llvm::OwningArrayPtr Allocated; unsigned *previous = SmallBuffer; - if (2*(n + 1) > SmallBufferSize) - Allocated = previous = new unsigned [2*(n+1)]; + if (2*(n + 1) > SmallBufferSize) { + previous = new unsigned [2*(n+1)]; + Allocated.reset(previous); + } unsigned *current = previous + (n + 1); for (unsigned i = 0; i <= n; ++i) @@ -118,8 +121,6 @@ unsigned StringRef::edit_distance(llvm::StringRef Other, } unsigned Result = previous[n]; - delete [] Allocated; - return Result; }