summaryrefslogtreecommitdiffstats
path: root/generic/tkOption.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-10-25 22:00:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-10-25 22:00:54 (GMT)
commit6517ea57da28dce9742a12980122acc1c59a5671 (patch)
tree44adfb486b7d1a745d56daa95b597a89e4b0fb7c /generic/tkOption.c
parent4b830288d02e49fa96ed7b5d20bf8170297abcba (diff)
downloadtk-6517ea57da28dce9742a12980122acc1c59a5671.zip
tk-6517ea57da28dce9742a12980122acc1c59a5671.tar.gz
tk-6517ea57da28dce9742a12980122acc1c59a5671.tar.bz2
Fix [477949]: option readfile cannot use multibytes.
Implementation adopted from AndroWish, but added support for UTF-8 BOM and added test-case.
Diffstat (limited to 'generic/tkOption.c')
-rw-r--r--generic/tkOption.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/generic/tkOption.c b/generic/tkOption.c
index 91a6cc0..bff799b 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -1086,7 +1086,7 @@ ReadOptionFile(
char *buffer;
int result, bufferSize;
Tcl_Channel chan;
- Tcl_DString newName;
+ Tcl_DString newName, optString;
/*
* Prevent file system access in a safe interpreter.
@@ -1136,7 +1136,16 @@ ReadOptionFile(
}
Tcl_Close(NULL, chan);
buffer[bufferSize] = 0;
- result = AddFromString(interp, tkwin, buffer, priority);
+ if ((bufferSize>2) && !memcmp(buffer, "\357\273\277", 3)) {
+ /* File starts with UTF-8 BOM */
+ result = AddFromString(interp, tkwin, buffer+3, priority);
+ } else {
+ Tcl_DStringInit(&optString);
+ Tcl_ExternalToUtfDString(NULL, buffer, bufferSize, &optString);
+ result = AddFromString(interp, tkwin, Tcl_DStringValue(&optString),
+ priority);
+ Tcl_DStringFree(&optString);
+ }
ckfree(buffer);
return result;
}