More secure work with weak pointers. Refs #214.

uhop · Aug 23, 2024 · f2be044 · f2be044
1 parent b928038
commit f2be044
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/addon.cc b/lib/addon.cc
@@ -116,11 +116,18 @@ const StrVal &WrappedRE2::prepareArgument(const v8::Local<v8::Value> &arg, bool
 {
 	size_t startFrom = ignoreLastIndex ? 0 : lastIndex;
 
-	if (lastString == arg && !node::Buffer::HasInstance(arg) && !lastCache.IsEmpty())
+	if (!lastString.IsEmpty())
 	{
-		// we have a properly cached string
 		lastString.ClearWeak();
+	}
+	if (!lastCache.IsEmpty())
+	{
 		lastCache.ClearWeak();
+	}
+
+	if (lastString == arg && !node::Buffer::HasInstance(arg) && !lastCache.IsEmpty())
+	{
+		// we have a properly cached string
 		lastStringValue.setIndex(startFrom);
 		return lastStringValue;
 	}