Accepting request 882194 from X11:XOrg
- Update to version 1.0.14 * bugfix release - supersedes U_NULL-pointer-dereference-in-XawAsciiSinkInitialize.patch OBS-URL: https://build.opensuse.org/request/show/882194 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libXaw?expand=0&rev=13factory
Richard Brown
2 years ago
committed by
Git OBS Bridge
commit
5daf5981ca
@ -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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd
|
||||
size 674140
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e
|
||||
size 690994
|
||||
Loading…
Reference in New Issue