diff options
| author | pspjuth <pspjuth@noemail.net> | 2011-04-22 18:24:21 (GMT) |
|---|---|---|
| committer | pspjuth <pspjuth@noemail.net> | 2011-04-22 18:24:21 (GMT) |
| commit | 6f30a656a3dbefdf7ee0d9382553eb34fd9cc060 (patch) | |
| tree | 6d17f823dc66eb53358a709b288da44d6a0922b9 | |
| parent | 997bfa0cf12203fa96a1fef7245579f824c6ce9b (diff) | |
| parent | 64aaca3423cb67d7f45609c67ea53f8906caae62 (diff) | |
| download | tk-6f30a656a3dbefdf7ee0d9382553eb34fd9cc060.zip tk-6f30a656a3dbefdf7ee0d9382553eb34fd9cc060.tar.gz tk-6f30a656a3dbefdf7ee0d9382553eb34fd9cc060.tar.bz2 | |
[Bug 3291543] There was a crash if dchars removed all coordinates of a polygon.
FossilOrigin-Name: 5df336a562b4333139344216c19bacfe2b083ba0
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkCanvPoly.c | 1 | ||||
| -rw-r--r-- | tests/canvas.test | 8 |
3 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2011-04-22 Peter Spjuth <peter.spjuth@gmail.com> + + * generic/tkCanvPoly.c: [Bug 3291543] There was a crash if dchars + * tests/canvas.test: removed all coordinates of a polygon. + 2011-04-21 Peter Spjuth <peter.spjuth@gmail.com> * doc/checkbutton.n: Document all variable options as global. diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index b043aad..01eeb26 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -1198,6 +1198,7 @@ PolygonDeleteCoords( polyPtr->numPoints = 0; if (polyPtr->coordPtr != NULL) { ckfree(polyPtr->coordPtr); + polyPtr->coordPtr = NULL; } ComputePolygonBbox(canvas, polyPtr); return; diff --git a/tests/canvas.test b/tests/canvas.test index 065de67..19fbbde 100644 --- a/tests/canvas.test +++ b/tests/canvas.test @@ -526,6 +526,14 @@ test canvas-11.2 {canvas poly overlap fill check, bug 226357} -setup { .c itemconfig 1 -width 8 lappend result [.c find over 45 50 45 50]; # outside poly } -result {1 1 {} 1 {} 1 1 {} 1 {} 1} +test canvas-11.3 {canvas poly dchars, bug 3291543} { + # This would crash + destroy .c + pack [canvas .c] + .c create polygon 0 0 0 10 10 0 + .c dchars 1 2 end + .c coords 1 +} {} test canvas-12.1 {canvas mm obj, patch SF-403327, 102471} -setup { destroy .c |