diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-08 19:48:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-08 19:48:50 (GMT) |
| commit | 60d4a253d3b89e3b5afcab7e334ee7e7e1ade88b (patch) | |
| tree | 6100d2cd31633d0ad3cbf28300b32f2fa94d49ea | |
| parent | 4faaaed255257997a18e08fb004130dc729d21a7 (diff) | |
| parent | 58d5a950146d3e9f05242e8dac90df955c1fa930 (diff) | |
| download | tk-60d4a253d3b89e3b5afcab7e334ee7e7e1ade88b.zip tk-60d4a253d3b89e3b5afcab7e334ee7e7e1ade88b.tar.gz tk-60d4a253d3b89e3b5afcab7e334ee7e7e1ade88b.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | unix/tkUnixRFont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 863fae9..144b052 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -753,8 +753,7 @@ Tk_MeasureChars( * This can't happen (but see #1185640) */ - *lengthPtr = curX; - return curByte; + goto measureCharsEnd; } source += clen; @@ -810,6 +809,7 @@ Tk_MeasureChars( curX = newX; curByte = newByte; } +measureCharsEnd: Tk_DeleteErrorHandler(handler); #ifdef DEBUG_FONTSEL string[len] = '\0'; |