aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorChong Yidong2005-11-18 03:57:36 +0000
committerChong Yidong2005-11-18 03:57:36 +0000
commitfe45ad152a8528e795c3d852bf3c2cd18ffe6e02 (patch)
treeac898cb128886dfbab663c08ad44282702c374eb /src/image.c
parent05338727a874606f2daa6e4d78fe871586aeffde (diff)
downloademacs-fe45ad152a8528e795c3d852bf3c2cd18ffe6e02.tar.gz
emacs-fe45ad152a8528e795c3d852bf3c2cd18ffe6e02.zip
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
fail.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c
index 1ba1cd197ff..c7bc71ee909 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3737,10 +3737,12 @@ x_create_bitmap_from_xpm_data (f, bits)
3737 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 3737 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
3738 bits, &bitmap, &mask, &attrs); 3738 bits, &bitmap, &mask, &attrs);
3739 if (rc != XpmSuccess) 3739 if (rc != XpmSuccess)
3740 return -1; 3740 {
3741 XpmFreeAttributes (&attrs);
3742 return -1;
3743 }
3741 3744
3742 id = x_allocate_bitmap_record (f); 3745 id = x_allocate_bitmap_record (f);
3743
3744 dpyinfo->bitmaps[id - 1].pixmap = bitmap; 3746 dpyinfo->bitmaps[id - 1].pixmap = bitmap;
3745 dpyinfo->bitmaps[id - 1].have_mask = 1; 3747 dpyinfo->bitmaps[id - 1].have_mask = 1;
3746 dpyinfo->bitmaps[id - 1].mask = mask; 3748 dpyinfo->bitmaps[id - 1].mask = mask;