Merge branch 'maint'

knopwob · May 6, 2018 · 7a91877 · 7a91877
2 parents 7dd22d7 + f9732bd
commit 7a91877
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 - `fullscreen` rule to hide notifications when a fullscreen window is active
 
+## 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
@@ -3,7 +3,7 @@
 
 include config.mk
 
-VERSION := "1.3.1-non-git"
+VERSION := "1.3.2-non-git"
 ifneq ($(wildcard ./.git/),)
 VERSION := $(shell git describe --tags)
 endif

diff --git 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;
 }