summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-11-13 13:51:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-11-13 13:51:01 (GMT)
commit2e6d95beee21bbef285dae951132b26375610e9a (patch)
tree7632a2c75a05dc0165cc20b25cac651bed222e70
parent5921d7eec877fe6fc43b1bb8ad0437871e4b1a9a (diff)
downloadtk-2e6d95beee21bbef285dae951132b26375610e9a.zip
tk-2e6d95beee21bbef285dae951132b26375610e9a.tar.gz
tk-2e6d95beee21bbef285dae951132b26375610e9a.tar.bz2
Fix [d43a10ce2fed950e00890049f3c273f2cdd12583|d43a10ce2f]: tk_getOpenFile crashes when passed a bad -typevariable.
-rw-r--r--win/tkWinDialog.c52
1 files changed, 50 insertions, 2 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index c90d05a..69dcb06 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1009,10 +1009,28 @@ Tk_GetSaveFileObjCmd(
*/
static void CleanupOFNOptions(OFNOpts *optsPtr)
{
+ if (optsPtr->extObj) {
+ Tcl_DecrRefCount(optsPtr->extObj);
+ optsPtr->extObj = NULL;
+ }
+ if (optsPtr->titleObj) {
+ Tcl_DecrRefCount(optsPtr->titleObj);
+ optsPtr->titleObj = NULL;
+ }
+ if (optsPtr->filterObj) {
+ Tcl_DecrRefCount(optsPtr->filterObj);
+ optsPtr->filterObj = NULL;
+ }
+ if (optsPtr->typeVariableObj) {
+ Tcl_DecrRefCount(optsPtr->typeVariableObj);
+ optsPtr->typeVariableObj = NULL;
+ }
+ if (optsPtr->initialTypeObj) {
+ Tcl_DecrRefCount(optsPtr->initialTypeObj);
+ optsPtr->initialTypeObj = NULL;
+ }
Tcl_DStringFree(&optsPtr->utfDirString);
}
-
-
/*
*----------------------------------------------------------------------
@@ -1124,9 +1142,21 @@ ParseOFNOptions(
string = Tcl_GetString(valuePtr);
switch (options[index].value) {
case FILE_DEFAULT:
+ if (valuePtr) {
+ Tcl_IncrRefCount(valuePtr);
+ }
+ if (optsPtr->extObj) {
+ Tcl_DecrRefCount(optsPtr->extObj);
+ }
optsPtr->extObj = valuePtr;
break;
case FILE_TYPES:
+ if (valuePtr) {
+ Tcl_IncrRefCount(valuePtr);
+ }
+ if (optsPtr->filterObj) {
+ Tcl_DecrRefCount(optsPtr->filterObj);
+ }
optsPtr->filterObj = valuePtr;
break;
case FILE_INITDIR:
@@ -1150,12 +1180,30 @@ ParseOFNOptions(
goto error_return;
break;
case FILE_TITLE:
+ if (valuePtr) {
+ Tcl_IncrRefCount(valuePtr);
+ }
+ if (optsPtr->titleObj) {
+ Tcl_DecrRefCount(optsPtr->titleObj);
+ }
optsPtr->titleObj = valuePtr;
break;
case FILE_TYPEVARIABLE:
+ if (valuePtr) {
+ Tcl_IncrRefCount(valuePtr);
+ }
+ if (optsPtr->typeVariableObj) {
+ Tcl_DecrRefCount(optsPtr->typeVariableObj);
+ }
optsPtr->typeVariableObj = valuePtr;
+ if (optsPtr->initialTypeObj) {
+ Tcl_DecrRefCount(optsPtr->initialTypeObj);
+ }
optsPtr->initialTypeObj = Tcl_ObjGetVar2(interp, valuePtr,
NULL, TCL_GLOBAL_ONLY);
+ if (optsPtr->initialTypeObj) {
+ Tcl_IncrRefCount(optsPtr->initialTypeObj);
+ }
break;
case FILE_MULTIPLE:
if (Tcl_GetBooleanFromObj(interp, valuePtr,