diff options
| author | hobbs <hobbs> | 1999-09-21 06:42:16 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-09-21 06:42:16 (GMT) |
| commit | f29a5be23f295f3e213d950ffbbea8ccbc06c8b5 (patch) | |
| tree | cbe860d1508f98a6d812f3f3090568a2d2f0bdbe /generic/tkFont.c | |
| parent | c0f23beb65e9af4511e5e455ca71039be233300b (diff) | |
| download | tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.zip tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.gz tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.bz2 | |
1999-09-16 Jeff Hobbs <hobbs@scriptics.com>
* generic/tkFont.c: fixed processing of font options and error
returned [Bug: 2075]
* win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the
wrong toplevel, and changed it to not set focus on overridden
toplevels
1999-09-15 Jeff Hobbs <hobbs@scriptics.com>
* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070]
and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX
version check (readjust from 8-21 fix) and several other config
fixes for AIX
* mac/tkMacMenubutton.c:
* unix/tkUnixMenubu.c: fixed permanently stippled menubutton image
* win/tkWinButton.c: fixed possible pointer smash [Bug: 2733]
1999-09-14 Jeff Hobbs <hobbs@scriptics.com>
* win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
Diffstat (limited to 'generic/tkFont.c')
| -rw-r--r-- | generic/tkFont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index a59c1b7..d63e58d 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.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: tkFont.c,v 1.5 1999/06/02 18:15:54 stanton Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.6 1999/09/21 06:42:30 hobbs Exp $ */ #include "tkPort.h" @@ -2837,7 +2837,7 @@ ConfigAttributesObj(interp, tkwin, objc, objv, faPtr) &index) != TCL_OK) { return TCL_ERROR; } - if (objc & 1) { + if ((i+2 >= objc) && (objc & 1)) { /* * This test occurs after Tcl_GetIndexFromObj() so that * "font create xyz -xyz" will return the error message |