Mercurial > emacs
changeset 66984:9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
fail.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 18 Nov 2005 03:57:36 +0000 |
| parents | 79256abc393d |
| children | bf8620d8ff03 03335deca80b |
| files | src/ChangeLog src/image.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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;