From 44352ba6f659e6b463e95908303d4ffe9d799aa8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 30 Jul 2018 14:43:47 +1000 Subject: [PATCH] Fix invalid pointer passed to FreeStmt() --- ...bcomp-fix-pointer-value-for-FreeStmt.patch | 26 +++++++++++++++++++ libxkbcommon.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch diff --git a/0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch b/0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch new file mode 100644 index 0000000..0b5a7fe --- /dev/null +++ b/0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch @@ -0,0 +1,26 @@ +From 259a8c12c288ac5bcc37c4b39f509f555f490870 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 30 Jul 2018 14:11:46 +1000 +Subject: [PATCH] xkbcomp: fix pointer value for FreeStmt + +Signed-off-by: Peter Hutterer +--- + src/xkbcomp/ast-build.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xkbcomp/ast-build.c b/src/xkbcomp/ast-build.c +index 58f97f9..e75fe47 100644 +--- a/src/xkbcomp/ast-build.c ++++ b/src/xkbcomp/ast-build.c +@@ -233,7 +233,7 @@ ExprAppendMultiKeysymList(ExprDef *expr, ExprDef *append) + darray_append(expr->keysym_list.symsNumEntries, numEntries); + darray_concat(expr->keysym_list.syms, append->keysym_list.syms); + +- FreeStmt((ParseCommon *) &append); ++ FreeStmt((ParseCommon *) append); + + return expr; + } +-- +2.17.1 + diff --git a/libxkbcommon.spec b/libxkbcommon.spec index fdb27a0..438e9b5 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -2,7 +2,7 @@ Name: libxkbcommon Version: 0.8.0 -Release: 4%{?gitdate:.%{gitdate}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}}%{?dist} Summary: X.Org X11 XKB parsing library License: MIT URL: http://www.x.org @@ -14,6 +14,8 @@ Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz %endif Source1: make-git-snapshot.sh +Patch01: 0001-xkbcomp-fix-pointer-value-for-FreeStmt.patch + BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros byacc flex bison BuildRequires: xorg-x11-proto-devel libX11-devel @@ -96,6 +98,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_libdir}/pkgconfig/xkbcommon-x11.pc %changelog +* Mon Jul 30 2018 Peter Hutterer 0.8.0-5 +- Fix invalid pointer passed to FreeStmt() + * Fri Jul 13 2018 Fedora Release Engineering - 0.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild