diff options
| author | das <das> | 2005-06-23 22:07:46 (GMT) |
|---|---|---|
| committer | das <das> | 2005-06-23 22:07:46 (GMT) |
| commit | 078b93e3d2db8985472c2805093fa98ecf16a54e (patch) | |
| tree | d11ce0cf18738720cc3f305468470606846b619e | |
| parent | c594ce3368db2942399f4230d81fc6ae861b0a4a (diff) | |
| download | tk-078b93e3d2db8985472c2805093fa98ecf16a54e.zip tk-078b93e3d2db8985472c2805093fa98ecf16a54e.tar.gz tk-078b93e3d2db8985472c2805093fa98ecf16a54e.tar.bz2 | |
* generic/tkConsole.c (TkConsolePrint): prevent potential NULL deref.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | generic/tkConsole.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,7 @@ 2005-06-23 Daniel Steffen <das@users.sourceforge.net> + * generic/tkConsole.c (TkConsolePrint): prevent potential NULL deref. + * macosx/tkMacOSXDefault.h: change ENTRY_BORDER defaults to from 5 to 2 to make default entry widgets in TkAqua look like in other aqua apps (and have same border dimensions as other platforms). [Bug 1176610] diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 28430b0..30d927a 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.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: tkConsole.c,v 1.22 2005/03/19 08:02:57 dkf Exp $ + * RCS: @(#) $Id: tkConsole.c,v 1.23 2005/06/23 22:07:46 das Exp $ */ #include "tk.h" @@ -803,7 +803,7 @@ TkConsolePrint(interp, devId, buffer, size) } info = (ConsoleInfo *) Tcl_GetAssocData(interp, TK_CONSOLE_INFO_KEY, NULL); - if (info->consoleInterp == NULL) { + if (info == NULL || info->consoleInterp == NULL) { return; } |