Changeset 1943 in kBuild

Timestamp:

Oct 26, 2008 2:19:06 AM (16 years ago)

Author:

bird

Message:

strcache2.c: fixed the length check.

File:

• trunk/src/kmk/strcache2.c (modified) (2 diffs)

trunk/src/kmk/strcache2.c

@@ -1052 +1052 @@
 {
   struct strcache2_entry const *entry;
-  unsigned hash;
+  unsigned int hash;
+  unsigned int length;
   const char *end;
 
@@ -1064 +1065 @@
     }
 
-  end = memchr (str, '\0', entry->length);
-  if ((size_t)(end - str) == entry->length)
+  end = memchr (str, '\0', entry->length + 1);
+  length = end - str;
+  if (length != entry->length)
     {
       fprintf (stderr,
-               "strcache2[%s]: corrupt entry %p, length: %lu, expected %u;\nstring: %s\n",
-               cache->name, (void *)entry, (unsigned long)(end - str), entry->length, str);
+               "strcache2[%s]: corrupt entry %p, length: %u, expected %u;\nstring: %s\n",
+               cache->name, (void *)entry, length, entry->length, str);
       return -1;
     }