From 331cc3f0799a54910a99484264f76569beeee55a Mon Sep 17 00:00:00 2001 From: James Cloos Date: Wed, 23 Jul 2008 00:01:43 -0400 Subject: Fix LookupColor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using strncasecmp(3) with the lenght of the user-supplied colour name will result in a false positive when the db key starts out with the same string. Eg, blue will also match BlueViolet (aka blue violet). Since the shorter strings occur first in the database, avoid such errors by treating a 0 result from strncasecmp(3) as a positive result when the key’s length is longer than the supplied string’s. --- os/oscolor.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'os') diff --git a/os/oscolor.c b/os/oscolor.c index cc45aafb1..69eadc23e 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -1590,6 +1590,8 @@ OsLookupColor(int screen, mid = (low + high) / 2; c = &BuiltinColors[mid]; r = strncasecmp (&BuiltinColorNames[c->name], name, len); + if (r == 0 && strlen (&BuiltinColorNames[c->name]) > len) + r++; if (r == 0) { *pred = c->red * 0x101; -- cgit v1.2.3