diff options
author | hobbs <hobbs> | 2007-07-04 18:10:52 (GMT) |
---|---|---|
committer | hobbs <hobbs> | 2007-07-04 18:10:52 (GMT) |
commit | 25063850eaccacc50b642bab996b93a0bc23a423 (patch) | |
tree | f28fbff019c67d2190c749a6bcb811b07822b5d8 /macosx/tkMacOSXXStubs.c | |
parent | 2fb301caf01b4707ef9639e45dec11c19b2cd5f4 (diff) | |
download | tk-25063850eaccacc50b642bab996b93a0bc23a423.zip tk-25063850eaccacc50b642bab996b93a0bc23a423.tar.gz tk-25063850eaccacc50b642bab996b93a0bc23a423.tar.bz2 |
* macosx/tkMacOSXXStubs.c (DestroyImage): Fixed crash in release
of image data for images coming from XGetImage, introduced
2007-06-23. (das)
Diffstat (limited to 'macosx/tkMacOSXXStubs.c')
-rw-r--r-- | macosx/tkMacOSXXStubs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 726bfc8..1232a01 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.18 2007/06/29 03:22:03 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.19 2007/07/04 18:10:52 hobbs Exp $ */ #include "tkMacOSXPrivate.h" @@ -938,8 +938,7 @@ DestroyImage( if (image) { if (image->obdata) { Tk_FreePixmap((Display*) gMacDisplay, (Pixmap) image->obdata); - } - if (image->data) { + } else if (image->data) { ckfree(image->data); } ckfree((char*) image); |