diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2022-02-04 22:27:17 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2022-02-04 22:31:21 +0100 |
| commit | ba60aede97330c5145f3245eb67a70b984b59116 (patch) | |
| tree | 5f10318058b147384551317784cdd42c8fb59112 | |
| parent | a82847dcf3bb691a3bd1dbbbdff1dbf150877774 (diff) | |
| download | guix-ba60aede97330c5145f3245eb67a70b984b59116.tar.gz | |
gnu: dunst: Fix crash on invalid pixbuf notification.
* gnu/packages/patches/dunst-1.7.3-fix-crash.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/dunst.scm (dunst)[source]<#:patches>: Add it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/dunst.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/dunst-1.7.3-fix-crash.patch | 21 |
3 files changed, 25 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f3487637ad..146b2a116a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1005,6 +1005,7 @@ dist_patch_DATA = \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ + %D%/packages/patches/dunst-1.7.3-fix-crash.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index 998470e411..7446c3689a 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -27,6 +27,7 @@ #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -48,7 +49,8 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ra0ii805w3rrs0qqbjxzl6i79ksz42lnvbglw18h4igkza21kzj")))) + "1ra0ii805w3rrs0qqbjxzl6i79ksz42lnvbglw18h4igkza21kzj")) + (patches (search-patches "dunst-1.7.3-fix-crash.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/patches/dunst-1.7.3-fix-crash.patch b/gnu/packages/patches/dunst-1.7.3-fix-crash.patch new file mode 100644 index 0000000000..8b51d820a4 --- /dev/null +++ b/gnu/packages/patches/dunst-1.7.3-fix-crash.patch @@ -0,0 +1,21 @@ +Author: Danny Milosavljevic <dannym@scratchpost.org> +Date: 2022-02-04 21:52:05 CET + +Fix crash if notification contains invalid pixbuf data. + +diff -ru /gnu/store/5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c 5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c +--- /gnu/store/5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c 1970-01-01 01:00:01.000000000 +0100 ++++ 5885czxhmhkckjqj939b0hd6b6czizwb-dunst-1.7.3-checkout/src/notification.c 2022-02-04 19:05:57.534906600 +0100 +@@ -359,8 +359,10 @@ + g_clear_pointer(&n->icon_id, g_free); + + GdkPixbuf *icon = icon_get_for_data(new_icon, &n->icon_id, draw_get_scale()); +- n->icon = gdk_pixbuf_to_cairo_surface(icon); +- g_object_unref(icon); ++ if (icon) { ++ n->icon = gdk_pixbuf_to_cairo_surface(icon); ++ g_object_unref(icon); ++ } + } + + /* see notification.h */ |