Accepting request 931562 from X11:XOrg

- u_no-longer-crash-in-XVisualIDFromVisual.patch
  * no longer crash in XVisualIDFromVisual() [boo#1191517]

OBS-URL: https://build.opensuse.org/request/show/931562
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libX11?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2021-11-20 01:38:11 +00:00 committed by Git OBS Bridge
commit f7aa0bdc41
3 changed files with 20 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 15 14:03:27 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
- u_no-longer-crash-in-XVisualIDFromVisual.patch
* no longer crash in XVisualIDFromVisual() [boo#1191517]
-------------------------------------------------------------------
Sun Jun 6 18:54:32 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -33,6 +33,7 @@ Patch0: p_khmer-compose.diff
Patch1: p_xlib_skip_ext_env.diff
# PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales
Patch2: en-locales.diff
Patch3: u_no-longer-crash-in-XVisualIDFromVisual.patch
BuildRequires: fdupes
BuildRequires: libtool
@ -137,6 +138,7 @@ test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
%patch0
%patch1
%patch2
%patch3 -p1
%build
%configure \

View File

@ -0,0 +1,12 @@
diff -u -p -r libX11-1.7.2.orig/src/Misc.c libX11-1.7.2/src/Misc.c
--- libX11-1.7.2.orig/src/Misc.c 2021-11-15 14:58:41.579310000 +0100
+++ libX11-1.7.2/src/Misc.c 2021-11-15 15:01:27.897244000 +0100
@@ -57,6 +57,8 @@ XDisplayKeycodes(
VisualID XVisualIDFromVisual(Visual *visual)
{
+ if (!visual)
+ return (VisualID)0;
return visual->visualid;
}