[Emacs-diffs] trunk r116417: * image.c (pbm_load): Set to NO_PIXMAP on error.

[Jan D.]

------------------------------------------------------------
revno: 116417
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16683
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-12 08:50:24 +0100
message:
  * image.c (pbm_load): Set to NO_PIXMAP on error.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-12 01:07:06 +0000
+++ b/src/ChangeLog     2014-02-12 07:50:24 +0000
@@ -1,3 +1,7 @@
+2014-02-12  Marcus Karlsson <address@hidden> (tiny change)
+
+       * image.c (pbm_load): Set to NO_PIXMAP on error (Bug#16683).
+
 2014-02-12  Lars Ingebrigtsen  <address@hidden>
 
        * buffer.c (syms_of_buffer): Doc clarification (bug#9981).

=== modified file 'src/image.c'
--- a/src/image.c       2014-01-23 17:27:37 +0000
+++ b/src/image.c       2014-02-12 07:50:24 +0000
@@ -5215,6 +5215,7 @@
       image_error ("Not a PBM image: `%s'", img->spec, Qnil);
     error:
       xfree (contents);
+      img->pixmap = NO_PIXMAP;
       return 0;
     }