[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99868: * image.c (free_image): Mark frame as garbaged (Bug#6426).

[Chong Yidong]

------------------------------------------------------------
revno: 99868
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-06-19 15:43:47 -0400
message:
  * image.c (free_image): Mark frame as garbaged (Bug#6426).
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-19 18:02:41 +0000
+++ b/src/ChangeLog     2010-06-19 19:43:47 +0000
@@ -1,5 +1,7 @@
 2010-06-19  Chong Yidong  <address@hidden>
 
+       * image.c (free_image): Mark frame as garbaged (Bug#6426).
+
        * keymap.c (Fdefine_key): Doc fix (Bug#6460).
 
 2010-06-15  Glenn Morris  <address@hidden>

=== modified file 'src/image.c'
--- a/src/image.c       2010-01-24 23:03:13 +0000
+++ b/src/image.c       2010-06-19 19:43:47 +0000
@@ -1094,6 +1094,10 @@
       /* Free resources, then free IMG.  */
       img->type->free (f, img);
       xfree (img);
+
+      /* As display glyphs may still be referring to the image ID, we
+        must garbage the frame (Bug#6426).  */
+      SET_FRAME_GARBAGED (f);
     }
 }