aboutsummaryrefslogtreecommitdiff
path: root/lib/Support/StringRef.cpp
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2010-11-07 06:09:02 +0000
committerTed Kremenek <kremenek@apple.com>2010-11-07 06:09:02 +0000
commit13302ec089d56b91f5d4b775910439ab9a74fd41 (patch)
tree69fac667e936fa259f556a64699db0244669607d /lib/Support/StringRef.cpp
parent7944988c2588c8015115b874a6bafd8f6fff7e25 (diff)
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
Diffstat (limited to 'lib/Support/StringRef.cpp')
-rw-r--r--lib/Support/StringRef.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/Support/StringRef.cpp b/lib/Support/StringRef.cpp
index 5ad862815b..d5fd12727d 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 <bitset>
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<unsigned> 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;
}