pcre2/CVE-2022-41409.patch
2023-10-16 13:50:23 +03:00

56 lines
1.3 KiB
Diff

From 94e1c001761373b7d9450768aa15d04c25547a35 Mon Sep 17 00:00:00 2001
From: Philip Hazel <Philip.Hazel@gmail.com>
Date: Tue, 16 Aug 2022 17:00:45 +0100
Subject: [PATCH] Diagnose negative repeat value in pcre2test subject line
---
src/pcre2test.c | 4 ++--
testdata/testinput2 | 3 +++
testdata/testoutput2 | 4 ++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/pcre2test.c b/src/pcre2test.c
index 08f86096..f6f5d66c 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -6844,9 +6844,9 @@ while ((c = *p++) != 0)
}
i = (int32_t)li;
- if (i-- == 0)
+ if (i-- <= 0)
{
- fprintf(outfile, "** Zero repeat not allowed\n");
+ fprintf(outfile, "** Zero or negative repeat not allowed\n");
return PR_OK;
}
diff --git a/testdata/testinput2 b/testdata/testinput2
index d37d8f30..717ba2ae 100644
--- a/testdata/testinput2
+++ b/testdata/testinput2
@@ -5880,6 +5880,9 @@
/^abc(?<!b\Kq)d/
abcd
+--
+ \[X]{-10}
+
# ---------
# End of testinput2
diff --git a/testdata/testoutput2 b/testdata/testoutput2
index ce090f8c..d2188d3c 100644
--- a/testdata/testoutput2
+++ b/testdata/testoutput2
@@ -17642,6 +17642,10 @@
abcd
0: abcd
+--
+ \[X]{-10}
+** Zero or negative repeat not allowed
+
# ---------
# End of testinput2