X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FRegex.cpp;h=f7fe1e4c7925d635f82e7fa6fb4c016fb233550f;hb=f359f7ef8c8cccea0c830308289fe7fe2c148bdc;hp=eb94745d9e36644279398c8a208d755fb85ca63c;hpb=22e0e0c1de72187f9f20e9d7375422b51ec10fb9;p=oota-llvm.git

diff --git a/lib/Support/Regex.cpp b/lib/Support/Regex.cpp
index eb94745d9e3..f7fe1e4c792 100644
--- a/lib/Support/Regex.cpp
+++ b/lib/Support/Regex.cpp
@@ -33,15 +33,17 @@ Regex::Regex(StringRef regex, unsigned Flags) {
 }
 
 Regex::~Regex() {
-  llvm_regfree(preg);
-  delete preg;
+  if (preg) {
+    llvm_regfree(preg);
+    delete preg;
+  }
 }
 
 bool Regex::isValid(std::string &Error) {
   if (!error)
     return true;
   
-  size_t len = llvm_regerror(error, preg, NULL, 0);
+  size_t len = llvm_regerror(error, preg, nullptr, 0);
   
   Error.resize(len - 1);
   llvm_regerror(error, preg, &Error[0], len);