re2 1.21.2 → 1.21.4

package/README.md

@@ -353,6 +353,8 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 1.21.4 *Fixed a regression reported by [caroline-matsec](https://github.com/caroline-matsec), thx! Added pre-compilation targets for Alpine Linux on ARM. Updated deps.*
+- 1.21.3 *Fixed an empty string regression reported by [Rhys Arkins](https://github.com/rarkins), thx! Updated deps.*
 - 1.21.2 *Fixed another memory regression reported by [matthewvalentine](https://github.com/matthewvalentine), thx! Updated deps. Added more tests and benchmarks.*
 - 1.21.1 *Fixed a memory regression reported by [matthewvalentine](https://github.com/matthewvalentine), thx! Updated deps.*
 - 1.21.0 *Fixed the performance problem reported by [matthewvalentine](https://github.com/matthewvalentine) (thx!). The change improves performance for multiple use cases.*

package/lib/addon.cc

@@ -112,10 +112,19 @@ void WrappedRE2::dropCache()
 	lastStringValue.clear();
 }
 
-const StrVal& WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool ignoreLastIndex)
+const StrVal &WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool ignoreLastIndex)
 {
 	size_t startFrom = ignoreLastIndex ? 0 : lastIndex;
 
+	if (!lastString.IsEmpty())
+	{
+		lastString.ClearWeak();
+	}
+	if (!lastCache.IsEmpty())
+	{
+		lastCache.ClearWeak();
+	}
+
 	if (lastString == arg && !node::Buffer::HasInstance(arg) && !lastCache.IsEmpty())
 	{
 		// we have a properly cached string
@@ -130,7 +139,6 @@ const StrVal& WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool
 		// no need to cache buffers
 
 		lastString.Reset(arg);
-		static_cast<v8::PersistentBase<v8::Value> &>(lastString).SetWeak();
 
 		auto argSize = node::Buffer::Length(arg);
 		lastStringValue.reset(arg, argSize, argSize, startFrom, true);
@@ -149,14 +157,12 @@ const StrVal& WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool
 	}
 
 	lastString.Reset(arg);
-	static_cast<v8::PersistentBase<v8::Value> &>(lastString).SetWeak();
 
 	auto s = t.ToLocalChecked();
 	auto argLength = Nan::DecodeBytes(s);
 
 	auto buffer = node::Buffer::New(v8::Isolate::GetCurrent(), s).ToLocalChecked();
 	lastCache.Reset(buffer);
-	static_cast<v8::PersistentBase<v8::Object> &>(lastCache).SetWeak();
 
 	auto argSize = node::Buffer::Length(buffer);
 	lastStringValue.reset(buffer, argSize, argLength, startFrom);
@@ -164,6 +170,19 @@ const StrVal& WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool
 	return lastStringValue;
 };
 
+void WrappedRE2::doneWithLastString()
+{
+	if (!lastString.IsEmpty())
+	{
+		static_cast<v8::PersistentBase<v8::Value> &>(lastString).SetWeak();
+	}
+
+	if (!lastCache.IsEmpty())
+	{
+		static_cast<v8::PersistentBase<v8::Object> &>(lastCache).SetWeak();
+	}
+}
+
 // StrVal
 
 void StrVal::setIndex(size_t newIndex)
@@ -204,12 +223,14 @@ void StrVal::setIndex(size_t newIndex)
 	index = newIndex;
 }
 
+static char null_buffer[] = {'\0'};
+
 void StrVal::reset(const v8::Local<v8::Value> &arg, size_t argSize, size_t argLength, size_t newIndex, bool buffer)
 {
 	clear();
 	isBuffer = buffer;
 	size = argSize;
 	length = argLength;
-	data = node::Buffer::Data(arg);
+	data = size ? node::Buffer::Data(arg) : null_buffer;
 	setIndex(newIndex);
 }

package/lib/exec.cc

@@ -14,7 +14,8 @@ NAN_METHOD(WrappedRE2::Exec)
 		return;
 	}
 
-	auto str = re2->prepareArgument(info[0]);
+	PrepareLastString prep(re2, info[0]);
+	StrVal& str = prep;
 	if (str.isBad) return; // throws an exception
 
 	if (re2->global || re2->sticky)

package/lib/match.cc

@@ -14,7 +14,8 @@ NAN_METHOD(WrappedRE2::Match)
 		return;
 	}
 
-	auto str = re2->prepareArgument(info[0], re2->global);
+	PrepareLastString prep(re2, info[0]);
+	StrVal& str = prep;
 	if (str.isBad) return; // throws an exception
 
 	if (!str.isValidIndex)

package/lib/replace.cc

@@ -497,7 +497,8 @@ NAN_METHOD(WrappedRE2::Replace)
 		return;
 	}
 
-	auto replacee = re2->prepareArgument(info[0]);
+	PrepareLastString prep(re2, info[0]);
+	StrVal& replacee = prep;
 	if (replacee.isBad) return; // throws an exception
 
 	if (!replacee.isValidIndex)

package/lib/search.cc

@@ -12,7 +12,8 @@ NAN_METHOD(WrappedRE2::Search)
 		return;
 	}
 
-	auto str = re2->prepareArgument(info[0], true);
+	PrepareLastString prep(re2, info[0]);
+	StrVal& str = prep;
 	if (str.isBad) return; // throws an exception
 
 	if (!str.data)

package/lib/split.cc

@@ -19,7 +19,8 @@ NAN_METHOD(WrappedRE2::Split)
 		return;
 	}
 
-	auto str = re2->prepareArgument(info[0], true);
+	PrepareLastString prep(re2, info[0]);
+	StrVal& str = prep;
 	if (str.isBad) return; // throws an exception
 
 	size_t limit = std::numeric_limits<size_t>::max();

package/lib/test.cc

@@ -14,7 +14,8 @@ NAN_METHOD(WrappedRE2::Test)
 		return;
 	}
 
-	auto str = re2->prepareArgument(info[0]);
+	PrepareLastString prep(re2, info[0]);
+	StrVal& str = prep;
 	if (str.isBad) return; // throws an exception
 
 	if (!re2->global && !re2->sticky)

package/lib/wrapped_re2.h

@@ -119,6 +119,30 @@ private:
 
 	void dropCache();
 	const StrVal &prepareArgument(const v8::Local<v8::Value> &arg, bool ignoreLastIndex = false);
+	void doneWithLastString();
+
+	friend class PrepareLastString;
+};
+
+struct PrepareLastString
+{
+	PrepareLastString(WrappedRE2 *re2, const v8::Local<v8::Value> &arg, bool ignoreLastIndex = false) : re2(re2) {
+		re2->prepareArgument(arg, ignoreLastIndex);
+	}
+
+	~PrepareLastString() {
+		re2->doneWithLastString();
+	}
+
+	operator const StrVal&() const {
+		return re2->lastStringValue;
+	}
+
+	operator StrVal&() {
+		return re2->lastStringValue;
+	}
+
+	WrappedRE2 *re2;
 };
 
 // utilities

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.21.2",
+  "version": "1.21.4",
   "description": "Bindings for RE2: fast, safe alternative to backtracking regular expression engines.",
   "homepage": "https://github.com/uhop/node-re2",
   "bugs": "https://github.com/uhop/node-re2/issues",
@@ -16,13 +16,13 @@
   ],
   "dependencies": {
     "install-artifact-from-github": "^1.3.5",
-    "nan": "^2.19.0",
-    "node-gyp": "^10.1.0"
+    "nan": "^2.20.0",
+    "node-gyp": "^10.2.0"
   },
   "devDependencies": {
-    "@types/node": "^20.14.2",
+    "@types/node": "^22.5.0",
     "heya-unit": "^0.3.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "scripts": {
     "test": "node tests/tests.js",
@@ -34,8 +34,8 @@
     "build": "node-gyp -j max build",
     "rebuild:dev": "node-gyp -j max rebuild --debug",
     "rebuild": "node-gyp -j max rebuild",
-    "clean": "node-gyp clean",
-    "reconfigure": "node-gyp configure"
+    "clean": "node-gyp clean && node-gyp configure",
+    "clean-build": "node-gyp clean"
   },
   "github": "https://github.com/uhop/node-re2",
   "repository": {