From: Pierre Schweitzer <pierre@reactos.org>
Date: Wed, 23 Feb 2011 12:09:07 +0000 (+0000)
Subject: [NTOSKRNL]
X-Git-Tag: ReactOS-0.3.13~167
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=54e7b58e770f5f3a8bd82ad10b744a89e2deb9e9

[NTOSKRNL]
Apply r50873 on FsRtlIsNameInExpression()

svn path=/trunk/; revision=50875
---

diff --git a/reactos/ntoskrnl/fsrtl/name.c b/reactos/ntoskrnl/fsrtl/name.c
index 29f6e90d76c..ecb2c3ff6a4 100644
--- a/reactos/ntoskrnl/fsrtl/name.c
+++ b/reactos/ntoskrnl/fsrtl/name.c
@@ -41,7 +41,7 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
             switch (Expression->Buffer[ExpressionPosition])
             {
                 case L'*':
-                    StarFound = ExpressionPosition++;
+                    StarFound = MAXUSHORT;
                     break;
 
                 case L'?':
@@ -88,6 +88,7 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
             if (ExpressionPosition == Expression->Length / sizeof(WCHAR))
             {
                 NamePosition = Name->Length / sizeof(WCHAR);
+                break;
             }
         }
         else if (Expression->Buffer[ExpressionPosition] == DOS_STAR)
@@ -109,14 +110,14 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
             ExpressionPosition = StarFound + 1;
             while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] :
                     Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition] &&
-                   NamePosition < Name->Length / sizeof(WCHAR))
+                    NamePosition < Name->Length / sizeof(WCHAR))
             {
                 NamePosition++;
             }
         }
         else
         {
-            NamePosition = Name->Length / sizeof(WCHAR);
+            break;
         }
     }
     if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR) &&