From 70c9d62d8d3616d69ec886ef54bfd3f0141858ff Mon Sep 17 00:00:00 2001 From: das Date: Sun, 7 Dec 2008 16:57:44 +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 b897162..35af0de 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.36.2.4 2008/12/07 16:48:00 das Exp $ + * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.36.2.5 2008/12/07 16:57:44 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -315,7 +315,7 @@ Tk_GetOpenFileObjCmd( } 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; @@ -376,7 +376,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); } end: -- cgit v0.12