diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-03-11 18:02:47 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-03-11 18:02:47 (GMT) |
| commit | a5102c9a477e543549b9413f49abb48f4e57ba2f (patch) | |
| tree | e43a57c94728f79b5afb7fe2fa023e2c807014cb | |
| parent | c11a52f6f9a6b7c639f8d114f92b2f9a92e779fe (diff) | |
| download | tk-a5102c9a477e543549b9413f49abb48f4e57ba2f.zip tk-a5102c9a477e543549b9413f49abb48f4e57ba2f.tar.gz tk-a5102c9a477e543549b9413f49abb48f4e57ba2f.tar.bz2 | |
3607326 Stop segfault from [listbox .l -listvariable $array].
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkListbox.c | 3 | ||||
| -rw-r--r-- | tests/listbox.test | 11 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2013-03-11 Don Porter <dgp@users.sourceforge.net> + + * generic/tkListbox.c: [Bug 3607326] Stop segfault from + * tests/listbox.test: [listbox .l -listvariable $array]. + 2013-02-28 Donal K. Fellows <dkf@users.sf.net> * unix/tkUnixKey.c (TkpGetKeySym): [Bug 3599312]: Put the diff --git a/generic/tkListbox.c b/generic/tkListbox.c index d803d7b..248dd7b 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.c @@ -1630,9 +1630,6 @@ ConfigureListbox( if (Tcl_SetVar2Ex(interp, listPtr->listVarName, NULL, listVarObj, TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG) == NULL) { - if (oldListObj == NULL) { - Tcl_DecrRefCount(listVarObj); - } continue; } } diff --git a/tests/listbox.test b/tests/listbox.test index 25bc606..b4046b6 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -2158,6 +2158,17 @@ test listbox-29.1 {listbox selection behavior, -state disabled} { lappend out [.l selection includes 2] [.l curselection] } {1 1 2} +test listbox-30.1 {Bug 3607326} -setup { + destroy .l + unset -nocomplain a +} -body { + array set a {} + listbox .l -listvariable a +} -cleanup { + destroy .l + unset -nocomplain a +} -result * -match glob -returnCodes error + resetGridInfo deleteWindows option clear |