From 84af1814b20547d7a009bf91c11e11eb572ef724 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 22 Jun 2005 21:23:32 +0000 Subject: * win/tclWinFile.c: Potential buffer overflow. [Bug 1225571] Thanks to Pat Thoyts for discovery and fix. --- ChangeLog | 3 +++ win/tclWinFile.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd0986b..0a04112 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,9 @@ 2005-06-22 Don Porter + * win/tclWinFile.c: Potential buffer overflow. [Bug 1225571] + Thanks to Pat Thoyts for discovery and fix. + * tests/safe.test: Backport performance improvement from reduced $::auto_path. diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 18c4787..d58fa35 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinFile.c,v 1.44.2.11 2005/03/15 18:08:24 vincentdarley Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.44.2.12 2005/06/22 21:23:33 dgp Exp $ */ //#define _WIN32_WINNT 0x0500 @@ -2085,7 +2085,7 @@ TclpFilesystemPathType(pathObjPtr) { #define VOL_BUF_SIZE 32 int found; - char volType[VOL_BUF_SIZE]; + WCHAR volType[VOL_BUF_SIZE]; char* firstSeparator; CONST char *path; @@ -2114,7 +2114,7 @@ TclpFilesystemPathType(pathObjPtr) Tcl_DString ds; Tcl_Obj *objPtr; - Tcl_WinTCharToUtf(volType, -1, &ds); + Tcl_WinTCharToUtf((CONST char *)volType, -1, &ds); objPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds),Tcl_DStringLength(&ds)); Tcl_DStringFree(&ds); return objPtr; -- cgit v0.12