pool/gnome-desktop
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 834993 from home:mgorse:branches:GNOME:Factory

Browse Source 
- Add gnome-desktop-invalid-size-crash.patch: fix a crash caused
  by a malformed background xml file (bsc#1176596
  glgo#GNOME/gnome-desktop#169).

OBS-URL: https://build.opensuse.org/request/show/834993
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=299
This commit is contained in:
Dominique Leuenberger 2020-09-22 09:02:38 +00:00 committed by Git OBS Bridge
parent 1969109805
commit b41cd7b7c8
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnome-desktop-invalid-size-crash.patch Normal file
View File

@ -0,0 +1,29 @@
From d35c6e0e41ec8c0426d1317b9f28f485b7b4530d Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Wed, 16 Sep 2020 15:02:30 -0500
Subject: [PATCH] gnome_bg_slide_show_get_current_slide: add NULL check
Ensure that a file is present. Guards against a crash in case of a
malformed xml file.
Resolves: https://gitlab.gnome.org/GNOME/gnome-desktop/-/issues/169
---
libgnome-desktop/gnome-bg-slide-show.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libgnome-desktop/gnome-bg-slide-show.c b/libgnome-desktop/gnome-bg-slide-show.c
index cad3cb6c..760ed566 100644
--- a/libgnome-desktop/gnome-bg-slide-show.c
+++ b/libgnome-desktop/gnome-bg-slide-show.c
@@ -543,7 +543,7 @@ gnome_bg_slide_show_get_current_slide (GnomeBGSlideShow *self,
if (is_fixed)
*is_fixed = slide->fixed;
- if (file1)
+ if (file1 && slide->file1)
*file1 = find_best_size (slide->file1, width, height);
if (file2 && slide->file2)
--
2.28.0

7
gnome-desktop.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 16 20:16:37 UTC 2020 - Michael Gorse <mgorse@suse.com>
- Add gnome-desktop-invalid-size-crash.patch: fix a crash caused
by a malformed background xml file (bsc#1176596
glgo#GNOME/gnome-desktop#169).
-------------------------------------------------------------------
Fri Sep 11 10:57:08 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

2
gnome-desktop.spec
View File

@ -28,6 +28,8 @@ Source99: baselibs.conf
# PATCH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
Patch1: gnome-desktop-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM gnome-desktop-invalid-size-crash.patch bsc#1176596 mgorse@suse.com -- fix a crash caused by a mal-formed background xml file.
Patch2: gnome-desktop-invalid-size-crash.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel