Author: pschweitzer
Date: Wed Feb 23 12:09:07 2011
New Revision: 50875
URL: http://svn.reactos.org/svn/reactos?rev=50875&view=rev
Log:
[NTOSKRNL]
Apply r50873 on FsRtlIsNameInExpression()
Modified:
trunk/reactos/ntoskrnl/fsrtl/name.c
Modified: trunk/reactos/ntoskrnl/fsrtl/name.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=50875&r1=50874&r2=50875&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Feb 23 12:09:07 2011
@@ -41,7 +41,7 @@
switch (Expression->Buffer[ExpressionPosition])
{
case L'*':
- StarFound = ExpressionPosition++;
+ StarFound = MAXUSHORT;
break;
case L'?':
@@ -88,6 +88,7 @@
if (ExpressionPosition == Expression->Length / sizeof(WCHAR))
{
NamePosition = Name->Length / sizeof(WCHAR);
+ break;
}
}
else if (Expression->Buffer[ExpressionPosition] == DOS_STAR)
@@ -109,14 +110,14 @@
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) &&
