From 5fd9fa8689e218009ed46a0205dace6c61a508ba Mon Sep 17 00:00:00 2001 From: andreas_kupries Date: Wed, 4 Jul 2007 17:32:39 +0000 Subject: * macosx/tkMacOSXXStubs.c (DestroyImage): Fixed seg.fault in release of image data for images coming from XGetImage. Change committed by me for Daniel Steffen. See 2007-06-23 for the change which introduced the problem. --- ChangeLog | 7 +++++++ macosx/tkMacOSXXStubs.c | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64349c1..b27bbc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-04 Andreas Kupries + + * macosx/tkMacOSXXStubs.c (DestroyImage): Fixed seg.fault in + release of image data for images coming from XGetImage. Change + committed by me for Daniel Steffen. See 2007-06-23 for the + change which introduced the problem. + 2007-07-02 Daniel Steffen * xlib/xgc.c (XCreateGC): correct black and white pixel values used to diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 6b2b7dd..31ae7ea 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.22 2007/06/29 03:20:02 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.23 2007/07/04 17:32:39 andreas_kupries Exp $ */ #include "tkMacOSXPrivate.h" @@ -940,8 +940,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); -- cgit v0.12