From 99711959d9accff6ee22ce2c51641def03871fce Mon Sep 17 00:00:00 2001 From: jenglish Date: Fri, 23 May 2008 17:58:05 +0000 Subject: Avoid passing width or height <= 0 to Tk_RedrawImage, as this leads to a panic on Windows [Bug 1967576] --- ChangeLog | 5 +++++ generic/ttk/ttkLabel.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index db99f69..99f91be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-23 Joe English + + * generic/ttk/ttkLabel.c: Avoid passing width or height <= 0 to + Tk_RedrawImage, as this leads to a panic on Windows [Bug 1967576] + 2008-05-11 Pat Thoyts * library/tk.tcl: Support for ttk widgets in AmpWidget diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index a95e305..ffc7928 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -1,4 +1,4 @@ -/* $Id: ttkLabel.c,v 1.11 2007/12/13 15:26:26 dgp Exp $ +/* $Id: ttkLabel.c,v 1.11.2.1 2008/05/23 17:58:08 jenglish Exp $ * * text, image, and label elements. * @@ -314,6 +314,12 @@ static void ImageDraw( height = Tk_Height(tkwin) - b.y; } + if (height <= 0 || width <= 0) { + /* Completely clipped - bail out. + */ + return; + } + Tk_RedrawImage(image->tkimg, 0,0, width, height, d, b.x, b.y); /* If we're disabled there's no state-specific 'disabled' image, -- cgit v0.12