* image.c (free_image): Mark frame as garbaged (Bug#6426).

diff --git a/src/ChangeLog b/src/ChangeLog
index 680f364a1fac4b7f6fd3d5e04990e916b7ab1da3..cf6f8427b255c82f2ed0dd75f275bfaf84671e0e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-19  Chong Yidong  <cyd@stupidchicken.com>
 
+       * image.c (free_image): Mark frame as garbaged (Bug#6426).
+
        * keymap.c (Fdefine_key): Doc fix (Bug#6460).
 
 2010-06-15  Glenn Morris  <rgm@gnu.org>

diff --git a/src/image.c b/src/image.c
index 1265b900c6cc645830c0a9cd3adb541ce6a71091..e7db3a7df1b8855fa6ff9b3142a0a62b18ac4dd2 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1094,6 +1094,10 @@ free_image (f, img)
       /* 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);
     }
 }