Fix a memory corruption

.gitignore

@@ -1,6 +1,7 @@
 /node_modules
 /build
 /lib/*.js
+*.swp
 *.o
 *.lo
 *.la

Gruntfile.coffee

@@ -29,10 +29,6 @@ module.exports = (grunt) ->
           include: false
         legal:
           copyright: false
-        readability:
-          braces: false
-        runtime:
-          sizeof: false
         whitespace:
           line_length: false
 

src/onig-reg-exp.cc

@@ -6,7 +6,9 @@
 using ::v8::Exception;
 using ::v8::String;
 
-OnigRegExp::OnigRegExp(const string& source) : source_(source) {
+OnigRegExp::OnigRegExp(const string& source)
+    : source_(source),
+      regex_(NULL) {
   OnigErrorInfo error;
   const UChar* sourceData = (const UChar*)source.data();
   int status = onig_new(&regex_, sourceData, sourceData + source.length(),
@@ -28,7 +30,13 @@ bool OnigRegExp::Contains(const string& value) {
   return source_.find(value) != string::npos;
 }
 
-OnigResult* OnigRegExp::Search(const string& searchString, size_t position) {
+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();
   const UChar* searchData = (const UChar*)searchString.data();
@@ -37,7 +45,7 @@ OnigResult* OnigRegExp::Search(const string& searchString, size_t position) {
                            ONIG_OPTION_NONE);
 
   if (status != ONIG_MISMATCH) {
-    return new OnigResult(region);
+    return shared_ptr<OnigResult>(new OnigResult(region));
   } else {
     onig_region_free(region, 1);
     return NULL;

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

src/onig-result.cc

@@ -2,8 +2,8 @@
 #include "onig-result.h"
 #include "unicode-utils.h"
 
-OnigResult::OnigResult(OnigRegion* region) {
-  region_ = region;
+OnigResult::OnigResult(OnigRegion* region)
+    : region_(region) {
 }
 
 OnigResult::~OnigResult() {

src/onig-scanner.cc

@@ -81,11 +81,11 @@ 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();
-      if (result != NULL) {
+      result = cachedResults[index];
+      if (result) {
         int location = result->LocationAt(0);
         if (hasMultibyteCharacters) {
           location = UnicodeUtils::characters_in_bytes(string.data(), location);
@@ -98,7 +98,7 @@ Handle<Value> OnigScanner::FindNextMatch(Handle<String> v8String, Handle<Number>
 
     if (!useCachedResult) {
       result = regExp->Search(string, byteOffset);
-      cachedResults[index] = shared_ptr<OnigResult>(result);
+      cachedResults[index] = result;
       maxCachedIndex = index;
     }
 
@@ -110,7 +110,7 @@ Handle<Value> OnigScanner::FindNextMatch(Handle<String> v8String, Handle<Number>
 
       if (bestIndex == -1 || location < bestLocation) {
         bestLocation = location;
-        bestResult = result;
+        bestResult = result.get();
         bestIndex = index;
       }