Fix memory leak when searching regexp.

atom · Mar 11, 2014 · 4bb991f · 4bb991f · zcbenz · Mar 12, 2014
1 parent e436861
commit 4bb991f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/onig-reg-exp.cc b/src/onig-reg-exp.cc
@@ -30,9 +30,12 @@ bool OnigRegExp::Contains(const string& value) {
   return source_.find(value) != string::npos;
 }
 
-OnigResult* OnigRegExp::Search(const string& searchString, size_t position) {
-  if (!regex_)
+shared_ptr<OnigResult> OnigRegExp::Search(const string& searchString,
+                                          size_t position) {
+  if (!regex_) {
     ThrowException(Exception::Error(String::New("RegExp is not valid")));
+    return NULL;
+  }
 
   int end = searchString.size();
   OnigRegion* region = onig_region_new();
@@ -42,7 +45,7 @@ OnigResult* OnigRegExp::Search(const string& searchString, size_t position) {
                            ONIG_OPTION_NONE);
 
   if (status != ONIG_MISMATCH) {
-    return new OnigResult(region, searchString);
+    return shared_ptr<OnigResult>(new OnigResult(region, searchString));
   } else {
     onig_region_free(region, 1);
     return NULL;

diff --git a/src/onig-reg-exp.h b/src/onig-reg-exp.h
@@ -1,10 +1,12 @@
 #ifndef SRC_ONIG_REG_EXP_H_
 #define SRC_ONIG_REG_EXP_H_
 
+#include <memory>
 #include <string>
 
 #include "oniguruma.h"
 
+using ::std::shared_ptr;
 using ::std::string;
 
 class OnigResult;
@@ -16,7 +18,7 @@ class OnigRegExp {
 
     bool Contains(const string& value);
     int LocationAt(int index);
-    OnigResult *Search(const string &searchString, size_t position);
+    shared_ptr<OnigResult> Search(const string &searchString, size_t position);
 
   private:
     OnigRegExp(const OnigRegExp&);  // Disallow copying

diff --git a/src/onig-scanner.cc b/src/onig-scanner.cc
@@ -76,24 +76,24 @@ Handle<Value> OnigScanner::FindNextMatch(Handle<String> v8String, Handle<Number>
     OnigRegExp *regExp = (*iter).get();
 
     bool useCachedResult = false;
-    OnigResult *result = NULL;
+    shared_ptr<OnigResult> result;
 
     if (useCachedResults && index <= maxCachedIndex) {
-      result = cachedResults[index].get();
-      useCachedResult = (result == NULL || result->LocationAt(0) >= charOffset);
+      result = cachedResults[index];
+      useCachedResult = (!result || result->LocationAt(0) >= charOffset);
     }
 
     if (!useCachedResult) {
       result = regExp->Search(string, byteOffset);
-      cachedResults[index] = shared_ptr<OnigResult>(result);
+      cachedResults[index] = result;
       maxCachedIndex = index;
     }
 
     if (result && result->Count() > 0) {
       int location = result->LocationAt(0);
       if (bestIndex == -1 || location < bestLocation) {
         bestLocation = location;
-        bestResult = result;
+        bestResult = result.get();
         bestIndex = index;
       }