xserver: Branch 'xwayland-22.1' - 2 commits

[GitLab Mirror]

 Xi/exevents.c |    4 +++-
 meson.build   |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 92c35190d0b7a4cba445796b557cec5b6aead60c
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Tue Feb 7 08:26:43 2023 +0100

    Bump version to 22.1.8
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/meson.build b/meson.build
index 47ebd4847..c2fcede2c 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xwayland', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '22.1.7',
+        version: '22.1.8',
         meson_version: '>= 0.47.0',
 )
-release_date = '2022-12-19'
+release_date = '2023-02-07'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')
commit 8660dd164882ce5fc1f274427e2ff3dc020d6273
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jan 25 11:41:40 2023 +1000

    Xi: fix potential use-after-free in DeepCopyPointerClasses
    
    CVE-2023-0494, ZDI-CAN-19596
    
    This vulnerability was discovered by:
    Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 0ba6d8c37071131a49790243cdac55392ecf71ec)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 217baa956..dcd4efb3b 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -619,8 +619,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));