summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-11-24 18:11:54 (GMT)
committerhobbs <hobbs>2006-11-24 18:11:54 (GMT)
commit9f5ab5519d8485a222584d78d91754615086f01b (patch)
treef4cdeee107ef79f75ddfe6685b0f10eb03a0b3f2 /win
parent9efa47af7492a545605cadcbceda5b7b69d0870b (diff)
downloadtk-9f5ab5519d8485a222584d78d91754615086f01b.zip
tk-9f5ab5519d8485a222584d78d91754615086f01b.tar.gz
tk-9f5ab5519d8485a222584d78d91754615086f01b.tar.bz2
* unix/tkUnixMenu.c (DrawMenuUnderline): bound Tcl_UtfAtIndex usage
* tests/menu.test (menu-36.1): [Bug 1599877]
Diffstat (limited to 'win')
-rw-r--r--win/tkWinMenu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 8bd4e16..5394353 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinMenu.c,v 1.21.2.7 2006/11/24 01:52:08 hobbs Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.21.2.8 2006/11/24 18:11:54 hobbs Exp $
*/
#define OEMRESOURCE
@@ -1059,7 +1059,7 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
Tcl_GetUnicodeFromObj(labelPtr, &len);
if (underline < len) {
char *label;
- label = Tcl_GetStringFromObj(labelPtr, &len);
+ label = Tcl_GetStringFromObj(labelPtr, NULL);
if (CharUpper((LPTSTR) menuChar)
== CharUpper((LPTSTR)
*Tcl_UtfAtIndex(label, underline))) {
@@ -1833,7 +1833,7 @@ DrawMenuUnderline(
if (mePtr->underline < len) {
CONST char *label, *start, *end;
- label = Tcl_GetStringFromObj(mePtr->labelPtr, &len);
+ label = Tcl_GetStringFromObj(mePtr->labelPtr, NULL);
start = Tcl_UtfAtIndex(label, mePtr->underline);
end = Tcl_UtfNext(start);
Tk_UnderlineChars(menuPtr->display, d,