27 lines
929 B
Diff
27 lines
929 B
Diff
From 87f42aa0e0096e9a346c9672aa3a0bd3bef8c1dd Mon Sep 17 00:00:00 2001
|
|
From: Karl Williamson <khw@cpan.org>
|
|
Date: Wed, 18 Dec 2024 18:25:29 -0700
|
|
Subject: [PATCH] CVE-2024-56406: Heap-buffer-overflow with tr//
|
|
|
|
This was due to underallocating needed space. If the translation forces
|
|
something to become UTF-8 that is initially bytes, that UTF-8 could
|
|
now require two bytes where previously a single one would do.
|
|
|
|
(cherry picked from commit f93109c8a6950aafbd7488d98e112552033a3686)
|
|
---
|
|
op.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/op.c b/op.c
|
|
index 69ff030e88eb..298b2926338a 100644
|
|
--- a/op.c
|
|
+++ b/op.c
|
|
@@ -6520,6 +6520,7 @@
|
|
* same time. But otherwise one crosses before the other */
|
|
if (t_cp < 256 && r_cp_end > 255 && r_cp != t_cp) {
|
|
can_force_utf8 = TRUE;
|
|
+ max_expansion = MAX(2, max_expansion);
|
|
}
|
|
}
|
|
|