Tk Source Code

Check-in [bde05b36]
Login

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

Overview
Comment:fix scoping of buf (introduced with fix for [Bug 2809525]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-4-branch
Files: files | file ages | folders
SHA1: bde05b3609a5bddacac39268baec32e2bddbbb9c
User & Date: jan.nijtmans 2012-03-26 12:32:05
Context
2012-03-29
07:28
implementation ready for further field-tests Closed-Leaf check-in: 10a332d1 user: jan.nijtmans tags: bug-3511806
2012-03-26
21:06
enable cygwin build in /win directory (using mingw-w64 compiler) check-in: beead5e4 user: jan.nijtmans tags: core-8-4-branch
12:34
fix scoping of buf (introduced with fix for [Bug 2809525]) check-in: 74aab909 user: jan.nijtmans tags: core-8-5-branch
12:32
fix scoping of buf (introduced with fix for [Bug 2809525] check-in: bde05b36 user: jan.nijtmans tags: core-8-4-branch
2012-03-21
22:17
[Bug 2809525] Abort on overlong color name check-in: 46289902 user: jan.nijtmans tags: core-8-4-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkColor.c.

816
817
818
819
820
821
822
823
824

825
826
827
828
829
830
831
Status
TkParseColor(display, map, name, color)
    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);







<
|
>







816
817
818
819
820
821
822

823
824
825
826
827
828
829
830
831
Status
TkParseColor(display, map, name, color)
    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);