- Update to version 1.0.14

* bugfix release 
- supersedes U_NULL-pointer-dereference-in-XawAsciiSinkInitialize.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXaw?expand=0&rev=20
This commit is contained in:
Stefan Dirsch 2021-03-30 15:11:53 +00:00 committed by Git OBS Bridge
parent 73b56e01dd
commit b09d9998d2
5 changed files with 14 additions and 56 deletions

View File

@ -1,47 +0,0 @@
Git-commit: ba7321b6a52726cdb9964b82c5111518dc1f437d
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Subject: NULL pointer dereference in XawAsciiSinkInitialize
References: bsc#1098411
Patch-Mainline: Upstream
Signed-off-by: Michal Srb <msrb@suse.com>
The function XawAsciiSinkInitialize is prone to a NULL pointer
dereference if no font is available.
Even though a specific check for a NULL font exists, it is called
after GetGC(), which in turn would trigger the NPE in such a case.
Spotted by calling xmessage on a system with an incomplete x font setup:
$ xmessage -b text
Warning: Unable to load any usable ISO8859 font
Segmentation fault
$ _
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
src/AsciiSink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/AsciiSink.c b/src/AsciiSink.c
index d776895..1cccb1c 100644
--- a/src/AsciiSink.c
+++ b/src/AsciiSink.c
@@ -1704,10 +1704,10 @@ XawAsciiSinkInitialize(Widget request, Widget cnew,
{
AsciiSinkObject sink = (AsciiSinkObject)cnew;
- GetGC(sink);
-
if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
+ GetGC(sink);
+
sink->ascii_sink.cursor_position = 0;
sink->ascii_sink.laststate = XawisOff;
sink->ascii_sink.cursor_x = sink->ascii_sink.cursor_y = 0;
--
2.13.6

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd
size 674140

3
libXaw-1.0.14.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e
size 690994

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 30 15:06:37 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 1.0.14
* bugfix release
- supersedes U_NULL-pointer-dereference-in-XawAsciiSinkInitialize.patch
-------------------------------------------------------------------
Thu Jun 21 08:46:58 UTC 2018 - msrb@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libXaw
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,23 +12,22 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: libXaw
Version: 1.0.13
Version: 1.0.14
Release: 0
Summary: The X Athena Widget Set
License: MIT
Group: Development/Libraries/C and C++
Url: http://xorg.freedesktop.org/
URL: http://xorg.freedesktop.org/
#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXaw
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libXaw/
Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch0: U_NULL-pointer-dereference-in-XawAsciiSinkInitialize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#git#BuildRequires: autoconf >= 2.60, automake, libtool
BuildRequires: pkgconfig
@ -103,7 +102,6 @@ in libXaw6/libXaw7/libXaw8.
%prep
%setup -q
%patch0 -p1
%build
%configure --docdir=%_docdir/%name --disable-static