diff options
| author | das <das> | 2008-12-07 16:57:52 (GMT) |
|---|---|---|
| committer | das <das> | 2008-12-07 16:57:52 (GMT) |
| commit | f1bb60faf171a22a1fca33351dc16105f51f7427 (patch) | |
| tree | 7c9470348bc542b23f1a6949a8fd7e209b8ed391 /macosx/tkMacOSXDialog.c | |
| parent | a309ae6fbd650db04cb0d1e2470f5ea5d092c410 (diff) | |
| download | tk-f1bb60faf171a22a1fca33351dc16105f51f7427.zip tk-f1bb60faf171a22a1fca33351dc16105f51f7427.tar.gz tk-f1bb60faf171a22a1fca33351dc16105f51f7427.tar.bz2 | |
Fix potential use of uninitialized variable flagged by clang static analyzer
Diffstat (limited to 'macosx/tkMacOSXDialog.c')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 7 |
1 files 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 |