diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-19 22:02:42 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-19 22:02:42 (GMT) |
| commit | 545af346b6b7f4d2e3c1bfa931e01202c6c7808d (patch) | |
| tree | 313f16de04d1f869c193750347eb6047316cb552 | |
| parent | e06c38d5e7dffdd9153afbd4c7c976de5167ca68 (diff) | |
| download | tk-545af346b6b7f4d2e3c1bfa931e01202c6c7808d.zip tk-545af346b6b7f4d2e3c1bfa931e01202c6c7808d.tar.gz tk-545af346b6b7f4d2e3c1bfa931e01202c6c7808d.tar.bz2 | |
[Bug 2931374]: Stop overflow of working buffer during construction of long
tag expressions.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | generic/tkCanvas.c | 8 | ||||
| -rw-r--r-- | tests/canvas.test | 11 |
3 files changed, 23 insertions, 5 deletions
@@ -1,7 +1,12 @@ +2010-01-19 Donal K. Fellows <dkf@users.sf.net> + + * generic/tkCanvas.c (TagSearchScanExpr): [Bug 2931374]: Stop overflow + of working buffer during construction of long tag expressions. + 2010-01-18 Jan Nijtmans <nijtmans@users.sf.net> - * generic/tkCanvas.c Apply patch [#2932808 ]: Canvas items - not updating on widget state change + * generic/tkCanvas.c: [Patch 2932808]: Canvas items not + updating on widget state change. 2010-01-09 Pat Thoyts <patthoyts@users.sourceforge.net> diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index eed2d5a..fa160b9 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvas.c,v 1.46.2.3 2010/01/18 21:20:09 nijtmans Exp $ + * RCS: @(#) $Id: tkCanvas.c,v 1.46.2.4 2010/01/19 22:02:43 dkf Exp $ */ /* #define USE_OLD_TAG_SEARCH 1 */ @@ -3233,7 +3233,11 @@ TagSearchScanExpr( while (searchPtr->stringIndex < searchPtr->stringLength) { c = searchPtr->string[searchPtr->stringIndex++]; - if (expr->allocated == expr->index) { + /* + * Need two slots free at this point, not one. [Bug 2931374] + */ + + if (expr->index >= expr->allocated-1) { expr->allocated += 15; if (expr->uids) { expr->uids = (Tk_Uid *) diff --git a/tests/canvas.test b/tests/canvas.test index 489ba27..f6a85fb 100644 --- a/tests/canvas.test +++ b/tests/canvas.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-2000 Ajuba Solutions. # All rights reserved. # -# RCS: @(#) $Id: canvas.test,v 1.23 2004/12/07 21:22:19 dgp Exp $ +# RCS: @(#) $Id: canvas.test,v 1.23.4.1 2010/01/19 22:02:43 dkf Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -367,6 +367,15 @@ test canvas-10.12 {multple events bound to same tag expr} -setup { .c bind {a && b} <Enter> {puts Enter} .c bind {a && b} <Leave> {puts Leave} } -result {} +test canvas-10.13 {more long tag searches; Bug 2931374} -setup { + catch {destroy .c} + canvas .c +} -body { + .c find withtag {(A&&B&&C&&D)&&area&&!text} + # memory errors on failure +} -cleanup { + destroy .c +} -result {} test canvas-11.1 {canvas poly fill check, bug 5783} -setup { destroy .c |