From 43863178b3de6b30882b86fa7569a9134c757b85 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Sun, 7 Dec 2008 16:57:52 +0000
Subject: Fix potential use of uninitialized variable flagged by clang static
 analyzer

---
 macosx/tkMacOSXDialog.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index ac65208..2253d07 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.22 2008/12/07 16:53:21 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.23 2008/12/07 16:57:52 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -317,7 +317,7 @@ Tk_GetOpenFileObjCmd(
 		if (choiceLen == 0) { initialDir = NULL; }
 		break;
 	    case OPEN_INITFILE:
-		initialFile = Tcl_GetString(objv[i + 1]);
+	    initialFile = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
 		/* empty strings should be like no selection given */
 		if (choiceLen == 0) { initialFile = NULL; }
 		break;
@@ -382,7 +382,8 @@ Tk_GetOpenFileObjCmd(
 	while (filterPtr && i-- > 0) {
 	    filterPtr = filterPtr->next;
 	}
-	Tcl_SetVar(interp, Tcl_GetString(typeVariablePtr), filterPtr->name, 0);
+	Tcl_SetVar(interp, Tcl_GetString(typeVariablePtr), filterPtr ?
+		filterPtr->name : "", 0);
     }
 #endif
 
-- 
cgit v0.12