From a9a61c77b3effd0e00b20ff714e430ee6b2a937a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Dj=C3=A4rv?= <jan.h.d@swipnet.se>
Date: Wed, 12 Feb 2014 08:50:24 +0100
Subject: [PATCH] * image.c (pbm_load): Set to NO_PIXMAP on error.

Fixes: debbugs:16683
---
 src/ChangeLog | 4 ++++
 src/image.c   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ba2a935b51..bd498c59f1a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-12  Marcus Karlsson <mk@acc.umu.se> (tiny change)
+
+	* image.c (pbm_load): Set to NO_PIXMAP on error (Bug#16683).
+
 2014-02-12  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* buffer.c (syms_of_buffer): Doc clarification (bug#9981).
diff --git a/src/image.c b/src/image.c
index 706745fb479..e53ad0b4a30 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5215,6 +5215,7 @@ pbm_load (struct frame *f, struct image *img)
       image_error ("Not a PBM image: `%s'", img->spec, Qnil);
     error:
       xfree (contents);
+      img->pixmap = NO_PIXMAP;
       return 0;
     }
 
-- 
2.39.2