# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1132286256 0
# Node ID 9d0a2cc054be5c5373f4dac0ae3b28c43e7d468f
# Parent  79256abc393d407070b23cf539c18e7092ef7d2a
	* image.c (x_create_bitmap_from_xpm_data): Free attributes on
	fail.

diff -r 79256abc393d -r 9d0a2cc054be src/ChangeLog
--- a/src/ChangeLog	Fri Nov 18 03:55:45 2005 +0000
+++ b/src/ChangeLog	Fri Nov 18 03:57:36 2005 +0000
@@ -1,5 +1,8 @@
 2005-11-17  Chong Yidong  <cyd@stupidchicken.com>
 
+	* image.c (x_create_bitmap_from_xpm_data): Free attributes on
+	fail.
+
 	* xfaces.c (Qignore_defface): New variable.
 	(syms_of_xfaces): Provide `:ignore-defface'.
 	(IGNORE_DEFFACE_P): New macro.
diff -r 79256abc393d -r 9d0a2cc054be src/image.c
--- a/src/image.c	Fri Nov 18 03:55:45 2005 +0000
+++ b/src/image.c	Fri Nov 18 03:57:36 2005 +0000
@@ -3737,10 +3737,12 @@
   rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
 				bits, &bitmap, &mask, &attrs);
   if (rc != XpmSuccess)
-    return -1;
+    {
+      XpmFreeAttributes (&attrs);
+      return -1;
+    }
 
   id = x_allocate_bitmap_record (f);
-
   dpyinfo->bitmaps[id - 1].pixmap = bitmap;
   dpyinfo->bitmaps[id - 1].have_mask = 1;
   dpyinfo->bitmaps[id - 1].mask = mask;