tidy up, fix a memory leak in Regex::isValid

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82707 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/Regex.h b/include/llvm/Support/Regex.h
index 31fd3ccefbbdf74d52bd82931486f6f56f2057ea..4c4229eb57b10b508355ce77bc3ce816f2ba6cf3 100644 (file)
--- a/include/llvm/Support/Regex.h
+++ b/include/llvm/Support/Regex.h
@@ -54,7 +54,6 @@ namespace llvm {
     /// Matches.
     /// For this feature to be enabled you must construct the regex using
     /// Regex("...", Regex::Sub) constructor.
-
     bool match(const StringRef &String, SmallVectorImpl<StringRef> *Matches=0);
   private:
     struct llvm_regex *preg;

diff --git a/lib/Support/Regex.cpp b/lib/Support/Regex.cpp
index f8b2446e3cf2ce82c84894ebe37756e1ec7a6133..9f5fbb0278c669cc9fde2c07fe175f3ae51c974d 100644 (file)
--- a/lib/Support/Regex.cpp
+++ b/lib/Support/Regex.cpp
@@ -10,15 +10,15 @@
 // This file implements a POSIX regular expression matcher.
 //
 //===----------------------------------------------------------------------===//
+
 #include "llvm/Support/Regex.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 #include "regex_impl.h"
 #include <string>
-
 using namespace llvm;
-Regex::Regex(const StringRef &regex, unsigned Flags)
-{
+
+Regex::Regex(const StringRef &regex, unsigned Flags) {
   unsigned flags = 0;
   preg = new struct llvm_regex;
   preg->re_endp = regex.end();
@@ -35,26 +35,23 @@ Regex::Regex(const StringRef &regex, unsigned Flags)
   error = llvm_regcomp(preg, regex.data(), flags|REG_EXTENDED|REG_PEND);
 }
 
-bool Regex::isValid(std::string &Error)
-{
+bool Regex::isValid(std::string &Error) {
   if (!error)
     return true;
 
   size_t len = llvm_regerror(error, preg, NULL, 0);
-  char *errbuff = new char[len];
-  llvm_regerror(error, preg, errbuff, len);
-  Error.assign(errbuff);
+  
+  Error.resize(len);
+  llvm_regerror(error, preg, &Error[0], len);
   return false;
 }
 
-Regex::~Regex()
-{
+Regex::~Regex() {
   llvm_regfree(preg);
   delete preg;
 }
 
-bool Regex::match(const StringRef &String, SmallVectorImpl<StringRef> *Matches)
-{
+bool Regex::match(const StringRef &String, SmallVectorImpl<StringRef> *Matches){
   unsigned nmatch = Matches ? preg->re_nsub+1 : 0;
 
   if (Matches) {
@@ -81,7 +78,7 @@ bool Regex::match(const StringRef &String, SmallVectorImpl<StringRef> *Matches)
   // There was a match.
 
   if (Matches) { // match position requested
-    for (unsigned i=0;i<nmatch; i++) {
+    for (unsigned i = 0; i != nmatch; ++i) {
       if (pm[i].rm_so == -1) {
         // this group didn't match
         Matches->push_back(StringRef());