Tk Source Code

Check-in [16d8b47d]
Login

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

Overview
Comment:Don't increase the epoch twice.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 16d8b47d1b888f068e5a4e0782ea3bb3003776b5
User & Date: fvogel 2012-01-25 21:35:15
Context
2012-01-25
22:07
Bug-2433260: non-critical error in Tk_PhotoPutBlock check-in: b2a3d1b5 user: jan.nijtmans tags: trunk
21:35
Don't increase the epoch twice. check-in: 16d8b47d user: fvogel tags: trunk
21:33
Don't increase the epoch twice. check-in: a26d55ff user: fvogel tags: core-8-5-branch
21:14
[Bug-1630271]: segfault/infinite loop when a mark is before -startline check-in: 30db605b user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.





1
2
3
4
5
6
7




2012-01-25  Francois Vogel  <[email protected]>

	* generic/tkText.c:      [Bug-1630271]: segfault/infinite loop
	* generic/tkTextMark.c:  when a mark is before -startline
	* tests/textMark.test:

2012-01-25  Francois Vogel  <[email protected]>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
2012-01-25  Francois Vogel  <[email protected]>

	* generic/tkText.c: Don't increase the epoch twice

2012-01-25  Francois Vogel  <[email protected]>

	* generic/tkText.c:      [Bug-1630271]: segfault/infinite loop
	* generic/tkTextMark.c:  when a mark is before -startline
	* tests/textMark.test:

2012-01-25  Francois Vogel  <[email protected]>

Changes to generic/tkText.c.

2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
	TkTextMarkNameToIndex(textPtr, "current", &index3);
	if (TkTextIndexCmp(&index3, &index1) < 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index1);
	}
	if (TkTextIndexCmp(&index3, &index2) > 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index2);
	}
        textPtr->sharedTextPtr->stateEpoch++;
    }

    /*
     * Don't allow negative spacings.
     */

    if (textPtr->spacing1 < 0) {







<







2132
2133
2134
2135
2136
2137
2138

2139
2140
2141
2142
2143
2144
2145
	TkTextMarkNameToIndex(textPtr, "current", &index3);
	if (TkTextIndexCmp(&index3, &index1) < 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index1);
	}
	if (TkTextIndexCmp(&index3, &index2) > 0) {
	    textPtr->currentMarkPtr = TkTextSetMark(textPtr, "current", &index2);
	}

    }

    /*
     * Don't allow negative spacings.
     */

    if (textPtr->spacing1 < 0) {