From 6ebe7ca413588b39d97daee966ba191773aaac05 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Sun, 6 May 2018 13:21:47 +0300 Subject: [PATCH 1/2] Fix crash when loading an invalid or corrupted icon GError values should be freed with g_error_free rather than g_free it otherwise causes a crash. Credit to @bebehei for discovering this. --- src/x11/x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x11/x.c b/src/x11/x.c index 0f38487..b3df19c 100644 --- a/src/x11/x.c +++ b/src/x11/x.c @@ -330,7 +330,7 @@ static GdkPixbuf *get_pixbuf_from_file(const char *icon_path) GError *error = NULL; pixbuf = gdk_pixbuf_new_from_file(icon_path, &error); if (pixbuf == NULL) - g_free(error); + g_error_free(error); } return pixbuf; } From f9732bd2fa84b5d721e30ee7835ebbf0bf5d7728 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Sun, 6 May 2018 13:30:01 +0300 Subject: [PATCH 2/2] Dunst v1.3.2 --- CHANGELOG.md | 6 ++++++ Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30e6e63..0f1d14f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Dunst changelog +## 1.3.2 - 2018-05-06 + +### Fixed + +- Crash when trying to load an invalid or corrupt icon (#512) + ## 1.3.1 - 2018-01-30 ### Fixed diff --git a/Makefile b/Makefile index 148e8ac..b600c5c 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include config.mk -VERSION := "1.3.1 (2018-01-30)" +VERSION := "1.3.2 (2018-05-06)" ifneq ($(wildcard ./.git/.),) VERSION := $(shell git describe --tags) endif