Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2014-10-11 19:26:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2014-10-07 16:00:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2014-10-11 19:28:35.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 10 16:26:27 UTC 2014 - [email protected] + +- Added 0001-Fix-incorrect-count-of-netwm-atoms.patch, kde#339771 + +------------------------------------------------------------------- New: ---- 0001-Fix-incorrect-count-of-netwm-atoms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.LfXv4X/_old 2014-10-11 19:28:36.000000000 +0200 +++ /var/tmp/diff_new_pack.LfXv4X/_new 2014-10-11 19:28:36.000000000 +0200 @@ -39,6 +39,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Fix-incorrect-count-of-netwm-atoms.patch +Patch0: 0001-Fix-incorrect-count-of-netwm-atoms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -81,6 +83,7 @@ %lang_package -n %lname %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert ++++++ 0001-Fix-incorrect-count-of-netwm-atoms.patch ++++++ >From 3576df163c8c64ebba74fc51c95de900dbf0220e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <[email protected]> Date: Thu, 9 Oct 2014 11:06:54 +0200 Subject: [PATCH 1/1] Fix incorrect count of netwm atoms This fixes a regression introduced with 59cb063b99e6ec13c0bc3cf3fd95a01258184e86. The commit added 4 new atoms but only incremented the atom count by 3. Which can cause a crash as soon as the NET classes are used. To ensure that such an error is not introduced again, an assert is added. BUG: 339771 REVIEW: 120539 --- src/netwm.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/netwm.cpp b/src/netwm.cpp index 3107a23..7b398d4 100644 --- a/src/netwm.cpp +++ b/src/netwm.cpp @@ -386,7 +386,7 @@ static QByteArray get_atom_name(xcb_connection_t *c, xcb_atom_t atom) } #endif -static const int netAtomCount = 91; +static const int netAtomCount = 92; static void create_netwm_atoms(xcb_connection_t *c) { @@ -498,6 +498,7 @@ static void create_netwm_atoms(xcb_connection_t *c) }; assert(!netwm_atoms_created); + assert(sizeof(atoms)/sizeof(atoms[0]) == netAtomCount + 1); // Send the intern atom requests xcb_intern_atom_cookie_t cookies[netAtomCount]; -- 2.1.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
