summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <[email protected]>2025-07-18 18:16:38 +0300
committerrobot-contrib <[email protected]>2025-07-18 18:33:35 +0300
commit0a93800f246f9cec39ca570be36e828147e19b5f (patch)
treec38b8d14bb0e7c5c795b84ec2787adbe9c2b5ff1
parent67abe9e17241e6f0920cccf14b342090f381c229 (diff)
Update contrib/libs/re2 to 2025-07-17
commit_hash:f458137ab4e72fa397a5b6c6e4004b1d814ad9eb
-rw-r--r--contrib/libs/re2/.yandex_meta/override.nix4
-rw-r--r--contrib/libs/re2/re2/re2.cc5
-rw-r--r--contrib/libs/re2/re2/testing/re2_test.cc8
-rw-r--r--contrib/libs/re2/re2/testing/ya.make2
-rw-r--r--contrib/libs/re2/ya.make4
5 files changed, 18 insertions, 5 deletions
diff --git a/contrib/libs/re2/.yandex_meta/override.nix b/contrib/libs/re2/.yandex_meta/override.nix
index 9b881c5ac47..cf2a022643f 100644
--- a/contrib/libs/re2/.yandex_meta/override.nix
+++ b/contrib/libs/re2/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
pkgs: attrs: with pkgs; with attrs; rec {
- version = "2025-06-26b";
+ version = "2025-07-17";
src = fetchFromGitHub {
owner = "google";
repo = "re2";
rev = "${version}";
- hash = "sha256-thON6Xdt2ihXqgj1qIyHYvoQWkBjvbswytCuSqH0LM0=";
+ hash = "sha256-8wxAFu013Nc67vikwXt5+A/5odEk62yHpRbeH6zHrlY=";
};
buildInputs = [
diff --git a/contrib/libs/re2/re2/re2.cc b/contrib/libs/re2/re2/re2.cc
index eef55ba2366..ebea83a135a 100644
--- a/contrib/libs/re2/re2/re2.cc
+++ b/contrib/libs/re2/re2/re2.cc
@@ -143,6 +143,11 @@ static std::string trunc(absl::string_view pattern) {
RE2::RE2(const char* pattern) {
+ // If absl::string_view becomes an alias for std::string_view,
+ // it will stop allowing NULL to be converted.
+ // Handle NULL explicitly to keep callers working no matter what.
+ if (pattern == NULL)
+ pattern = "";
Init(pattern, DefaultOptions);
}
diff --git a/contrib/libs/re2/re2/testing/re2_test.cc b/contrib/libs/re2/re2/testing/re2_test.cc
index 04c040e9eb6..5c1822d7f8a 100644
--- a/contrib/libs/re2/re2/testing/re2_test.cc
+++ b/contrib/libs/re2/re2/testing/re2_test.cc
@@ -1688,4 +1688,12 @@ TEST(RE2, Issue477) {
ASSERT_EQ(s, "\x61\x63");
}
+TEST(RE2, InitNULL) {
+ // RE2::RE2 accepts NULL. Make sure it keeps doing that.
+ RE2 re(NULL);
+ ASSERT_TRUE(re.ok());
+ ASSERT_TRUE(RE2::FullMatch("", re));
+ ASSERT_TRUE(RE2::FullMatch("", NULL));
+}
+
} // namespace re2
diff --git a/contrib/libs/re2/re2/testing/ya.make b/contrib/libs/re2/re2/testing/ya.make
index f05e2daf5f9..f58c050513f 100644
--- a/contrib/libs/re2/re2/testing/ya.make
+++ b/contrib/libs/re2/re2/testing/ya.make
@@ -6,7 +6,7 @@ LICENSE(BSD-3-Clause)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(2025-06-26b)
+VERSION(2025-07-17)
PEERDIR(
contrib/libs/re2
diff --git a/contrib/libs/re2/ya.make b/contrib/libs/re2/ya.make
index b77cd61be54..3bd65583db6 100644
--- a/contrib/libs/re2/ya.make
+++ b/contrib/libs/re2/ya.make
@@ -9,9 +9,9 @@ LICENSE(
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(2025-06-26b)
+VERSION(2025-07-17)
-ORIGINAL_SOURCE(https://github.com/google/re2/archive/2025-06-26b.tar.gz)
+ORIGINAL_SOURCE(https://github.com/google/re2/archive/2025-07-17.tar.gz)
PEERDIR(
contrib/restricted/abseil-cpp