diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-07-05 14:20:23 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-07-05 14:20:23 (GMT) |
| commit | 6e2551232a9496569c87a2e744b0ff924f1a69c1 (patch) | |
| tree | 500b0857874ff1646a8069f18c43e30a8c5acabe | |
| parent | 7a759b769c9ef7bed1085c243c8eafdb5f357726 (diff) | |
| download | tk-6e2551232a9496569c87a2e744b0ff924f1a69c1.zip tk-6e2551232a9496569c87a2e744b0ff924f1a69c1.tar.gz tk-6e2551232a9496569c87a2e744b0ff924f1a69c1.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2007-07-04 Andreas Kupries <andreask@activestate.com> + + * 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 <das@users.sourceforge.net> * xlib/xgc.c (XCreateGC): correct black and white pixel values used to diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 20fd481..4d8b9d0 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.17.2.5 2007/07/01 17:31:38 dgp Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.17.2.6 2007/07/05 14:20:23 dgp 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); |