Changeset 21302 for trunk/src/kernel32/handlenames.cpp

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

• trunk/src/kernel32/handlenames.cpp (modified) (1 diff)

trunk/src/kernel32/handlenames.cpp

@@ -164 +164 @@
                                           BOOL fCaseInsensitive)
 {
+  int               cchSymbolicLink = strlen(pszSymbolicLink);
   PLINEARLISTENTRY pLE = pSymbolicLinks->getFirst();
   while (pLE)
   {
     PHANDLENAME pHandleName = (PHANDLENAME)pLE->pObject;
-    
-    int iLen = strlen(pHandleName->pszSymbolicLink);
-    
+    int cch = pHandleName->ulSymbolicLinkLength; //strlen(pHandleName->pszSymbolicLink);
+    
+    /* pszSymbolicLink must end a path component at cch. */
+    if (    cch <= cchSymbolicLink
+        &&  (pszSymbolicLink[cch] == '\\' || pszSymbolicLink[cch] == '\0'))
+    {
     if (fCaseInsensitive)
     {
-      // Note: pszSymbolicLink must either terminate at [iLen] or
-      // have a delimiter.
-      if ( (pszSymbolicLink[iLen] == '\\') ||
-           (pszSymbolicLink[iLen] == 0) )
-        if (strnicmp(pHandleName->pszSymbolicLink, pszSymbolicLink, iLen) == 0)
+            if (!strnicmp(pHandleName->pszSymbolicLink, pszSymbolicLink, cch))
           return pHandleName;
     }
     else
     {
-      if ( (pszSymbolicLink[iLen] == '\\') ||
-           (pszSymbolicLink[iLen] == 0) )
-        if (strncmp(pHandleName->pszSymbolicLink, pszSymbolicLink, iLen) == 0)
+            if (!memcmp(pHandleName->pszSymbolicLink, pszSymbolicLink, cch))
           return pHandleName;
     }
-    
+    }
     
     // skip to the next entry