Tk Source Code

Check-in [e8d270f5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fix for scoping of buf (introduced with fix for [Bug 2809525])
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e8d270f57de68e51d3277d0a7c6adbd197e2db46
User & Date: jan.nijtmans 2012-03-26 12:35:31
Context
2012-04-02
09:48
[Bug 3511806] Compiler checks too early (autoconf still to be run!) check-in: 8a25f37b user: jan.nijtmans tags: trunk
08:42
proposed fix for [bug 3512824]: Tk and dual/multihead on windows check-in: aaa5dd4e user: jan.nijtmans tags: bug-3512824
2012-03-26
12:35
fix for scoping of buf (introduced with fix for [Bug 2809525]) check-in: e8d270f5 user: jan.nijtmans tags: trunk
12:34
fix scoping of buf (introduced with fix for [Bug 2809525]) check-in: 74aab909 user: jan.nijtmans tags: core-8-5-branch
2012-03-21
22:23
[Bug 2809525] Abort on overlong color name check-in: 550636bb user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkColor.c.

831
832
833
834
835
836
837
838
839

840
841
842
843
844
845
846
Status
TkParseColor(
    Display *display,		/* The display */
    Colormap map,			/* Color map */
    const char *name,     /* String to be parsed */
    XColor *color)
{
    if (*name == '#') {
	char buf[14];

	buf[0] = '#'; buf[13] = '\0';
	if (!*(++name) || !*(++name) || !*(++name)) {
	    /* Not at least 3 hex digits, so invalid */
	return 0;
	} else if (!*(++name)) {
	    /* Exactly 3 hex digits */
	    buf[9] = buf[10] = buf[11] = buf[12] = *(--name);







<
|
>







831
832
833
834
835
836
837

838
839
840
841
842
843
844
845
846
Status
TkParseColor(
    Display *display,		/* The display */
    Colormap map,			/* Color map */
    const char *name,     /* String to be parsed */
    XColor *color)
{

    char buf[14];
    if (*name == '#') {
	buf[0] = '#'; buf[13] = '\0';
	if (!*(++name) || !*(++name) || !*(++name)) {
	    /* Not at least 3 hex digits, so invalid */
	return 0;
	} else if (!*(++name)) {
	    /* Exactly 3 hex digits */
	    buf[9] = buf[10] = buf[11] = buf[12] = *(--name);