From ceb340bc3ce4885d2a8c63a536a24f5064fb8846 Mon Sep 17 00:00:00 2001
From: liweiganga <liweiganga@uniontech.com>
Date: Fri, 17 Feb 2023 16:48:18 +0800
Subject: [PATCH] fix CVE-2023-0494

---
 backport-CVE-2023-0494.patch | 28 ++++++++++++++++++++++++++++
 xorg-x11-server.spec         |  6 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 backport-CVE-2023-0494.patch

diff --git a/backport-CVE-2023-0494.patch b/backport-CVE-2023-0494.patch
new file mode 100644
index 0000000..3e13180
--- /dev/null
+++ b/backport-CVE-2023-0494.patch
@@ -0,0 +1,28 @@
+From 4005f77c03f67f1527519969b047c599cba32e36 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 17 Feb 2023 16:34:39 +0800
+Subject: [PATCH] fix CVE-2023-0494
+
+---
+ Xi/exevents.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 659816a..0cb8d78 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -575,8 +575,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
+             memcpy(to->button->xkb_acts, from->button->xkb_acts,
+                    sizeof(XkbAction));
+         }
+-        else
++        else {
+             free(to->button->xkb_acts);
++            to->button->xkb_acts = NULL;
++        }
+ 
+         memcpy(to->button->labels, from->button->labels,
+                from->button->numButtons * sizeof(Atom));
+-- 
+2.20.1
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index aa7c33b..6546db7 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -16,7 +16,7 @@
 
 Name:           xorg-x11-server
 Version:        1.20.8
-Release:        15
+Release:        16
 Summary:        X.Org X11 X server
 License:        MIT and GPLv2
 URL:            https://www.x.org
@@ -103,6 +103,7 @@ Patch6013: backport-CVE-2022-46343.patch
 Patch6014: backport-Xi-return-an-error-from-XI-property-changes-if-verification-failed.patch
 Patch6015: backport-CVE-2022-46344.patch
 Patch6016: backport-CVE-2022-4283.patch
+Patch6017: backport-CVE-2023-0494.patch
 
 BuildRequires:  audit-libs-devel autoconf automake bison dbus-devel flex flex-devel git gcc
 BuildRequires:  systemtap-sdt-devel libtool pkgconfig 
@@ -345,6 +346,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %{_libdir}/xorg/protocol.txt
 
 %changelog
+* Fri Feb 17 2023 liweiganga <liweiganga@uniontech.com> - 1.20.8-16
+- fix CVE-2023-0494
+
 * Tue Jan 10 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.20.8-15
 - add missing patches
 
-- 
Gitee