Commit fe45ad15 authored by Chong Yidong's avatar Chong Yidong
Browse files

* image.c (x_create_bitmap_from_xpm_data): Free attributes on

	fail.
parent 05338727
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.
......
......@@ -3737,10 +3737,12 @@ x_create_bitmap_from_xpm_data (f, bits)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment