diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-03-11 18:39:23 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-03-11 18:39:23 (GMT) |
| commit | e26359c3f1ac6a3e9bd2c0eb0abb3cccb7a86774 (patch) | |
| tree | 8d99c3d688bd25abab53e0bf56261399255a5e32 | |
| parent | 0e5747eb2704c1b05cd30ccdf45fdc070851d8e8 (diff) | |
| parent | 80d43beb6caae9ce728cd5054194124706038073 (diff) | |
| download | tk-e26359c3f1ac6a3e9bd2c0eb0abb3cccb7a86774.zip tk-e26359c3f1ac6a3e9bd2c0eb0abb3cccb7a86774.tar.gz tk-e26359c3f1ac6a3e9bd2c0eb0abb3cccb7a86774.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 48287ee..d77fc8f 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.c @@ -1629,9 +1629,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 0805528..e05d574 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -3057,6 +3057,17 @@ test listbox-29.1 {listbox selection behavior, -state disabled} -setup { destroy .l } -result {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 |