summaryrefslogtreecommitdiffhomepage
path: root/patches/fribidi/CVE-2022-25309.patch
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2022-04-15 14:31:14 +0200
committerØrjan Malde <red@foxi.me>2022-04-15 14:31:14 +0200
commit22c622b0cf3dd0c813c7054d442da336674b9786 (patch)
treeb2efa6c518e3b63d4364b01735c7d51a12f35b40 /patches/fribidi/CVE-2022-25309.patch
parent1b0a65f28a480d4e743992de1ab6fd62f9f98f54 (diff)
downloadmidipix_build-22c622b0cf3dd0c813c7054d442da336674b9786.tar.bz2
midipix_build-22c622b0cf3dd0c813c7054d442da336674b9786.tar.xz
patches/fribidi/*.patch: merge fixes for CVE-2022-{25308,25309,25310}.
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches/fribidi/CVE-2022-25309.patch')
-rw-r--r--patches/fribidi/CVE-2022-25309.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/patches/fribidi/CVE-2022-25309.patch b/patches/fribidi/CVE-2022-25309.patch
new file mode 100644
index 0000000..3dc9fd9
--- /dev/null
+++ b/patches/fribidi/CVE-2022-25309.patch
@@ -0,0 +1,27 @@
+From f22593b82b5d1668d1997dbccd10a9c31ffea3b3 Mon Sep 17 00:00:00 2001
+From: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Fri, 25 Mar 2022 09:09:49 +0300
+Subject: [PATCH] Protected against garbage in the CapRTL encoder
+
+---
+ lib/fribidi-char-sets-cap-rtl.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/fribidi-char-sets-cap-rtl.c b/lib/fribidi-char-sets-cap-rtl.c
+index b0c0e4a..f74e010 100644
+--- a/lib/fribidi-char-sets-cap-rtl.c
++++ b/lib/fribidi-char-sets-cap-rtl.c
+@@ -232,7 +232,12 @@ fribidi_cap_rtl_to_unicode (
+ }
+ }
+ else
+- us[j++] = caprtl_to_unicode[(int) s[i]];
++ {
++ if ((int)s[i] < 0)
++ us[j++] = '?';
++ else
++ us[j++] = caprtl_to_unicode[(int) s[i]];
++ }
+ }
+
+ return j;