Tk Source Code

Check-in [b938e236]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:3341056 Correct segfault due to flaw in the 2011-06-17 commit.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: b938e2364a82b9589c87ed813dde056010a5c9b9
User & Date: dgp 2011-06-29 21:34:11
Context
2011-07-28
08:48
[Bug 3380684] XEmptyRegion prototype doesn't match usage check-in: 2b12f5db user: jan.nijtmans tags: core-8-5-branch
2011-07-04
16:16
Commit of backport of Tk-Cocoa to 8.5 check-in: d3143d1c user: kevin_walzer tags: tk-cocoa-8-5-backport
2011-06-29
21:35
3341056 Correct segfault due to flaw in the 2011-06-17 commit. check-in: 88ddbd6b user: dgp tags: trunk
21:34
3341056 Correct segfault due to flaw in the 2011-06-17 commit. check-in: b938e236 user: dgp tags: core-8-5-branch
2011-06-24
17:48
merge RC to stable check-in: 7fe694e2 user: dgp tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.






1
2
3
4
5
6
7





2011-06-23  Don Porter  <[email protected]>

	* changes:	Updated for 8.5.10 release.

2011-06-17  Don Porter  <[email protected]>

	*** 8.5.10 TAGGED FOR RELEASE ***
>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
2011-06-29  Don Porter  <[email protected]>

	* generic/ttk/ttkTrace.c: [Bug 3341056] Correct segfault due to flaw
	* tests/ttk/ttk.test:	in the 2011-06-17 commit.

2011-06-23  Don Porter  <[email protected]>

	* changes:	Updated for 8.5.10 release.

2011-06-17  Don Porter  <[email protected]>

	*** 8.5.10 TAGGED FOR RELEASE ***

Changes to generic/ttk/ttkTrace.c.

132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
	 */

	/*
	 * Search the traces on the variable to see if the one we are tasked
	 * with removing is present.
	 */
	while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj),
		0, VarTraceProc, cd)) != NULL) {
	    if (cd == (ClientData) h) {
		break;
	    }
	}
	/*
	 * If the trace we wish to delete is not visible, Tcl_UntraceVar
	 * will do nothing, so don't try to call it.  Instead set an







|







132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
	 */

	/*
	 * Search the traces on the variable to see if the one we are tasked
	 * with removing is present.
	 */
	while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj),
		TCL_GLOBAL_ONLY, VarTraceProc, cd)) != NULL) {
	    if (cd == (ClientData) h) {
		break;
	    }
	}
	/*
	 * If the trace we wish to delete is not visible, Tcl_UntraceVar
	 * will do nothing, so don't try to call it.  Instead set an

Changes to tests/ttk/ttk.test.

556
557
558
559
560
561
562
563
564
565
566
567

















568
569
570
571
572
573
574
  -match glob -cleanup { destroy .tw }

test ttk-15.1 {Bug 3062331} -setup {
    destroy .b
} -body {
    set Y {}
    ttk::button .b -textvariable Y
    trace variable Y u "destroy .b"
    unset Y
} -cleanup {
    destroy .b
} -result {}


















## Test ensemble processing:
#
# (See also: SF#2021443)
#
proc wrong#args {args} {
    return "wrong # args: should be \"$args\""







|




>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
  -match glob -cleanup { destroy .tw }

test ttk-15.1 {Bug 3062331} -setup {
    destroy .b
} -body {
    set Y {}
    ttk::button .b -textvariable Y
    trace variable Y u "destroy .b; #"
    unset Y
} -cleanup {
    destroy .b
} -result {}

test ttk-15.2 {Bug 3341056} -setup {
    proc foo {} {
	destroy .lf
	ttk::labelframe .lf
	ttk::checkbutton .lf.cb -text xxx
    }
} -body {
    ttk::button .b -text xxx -command foo
    .b invoke
    .b invoke
    .lf.cb invoke
    destroy .b
} -cleanup {
    rename foo {}
    destroy .lf
} -result {}

## Test ensemble processing:
#
# (See also: SF#2021443)
#
proc wrong#args {args} {
    return "wrong # args: should be \"$args\""