From 589577fe34ae061be8fac5f62caae74ea438281e Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 5 Aug 2010 12:23:23 +0000
Subject: [PATCH] [NTOSKRNL] - Fixed FsRtlIsNameInExpression to make it
 properly handle * in expressions - Fix formatting - Patch by Pierre
 Schweitzer - Fixes everything

See issue #5541 for more details.

svn path=/trunk/; revision=48461
---
 reactos/ntoskrnl/fsrtl/name.c | 99 +++++++++++++++++------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/reactos/ntoskrnl/fsrtl/name.c b/reactos/ntoskrnl/fsrtl/name.c
index 881a66799bb..1405b9f99c4 100644
--- a/reactos/ntoskrnl/fsrtl/name.c
+++ b/reactos/ntoskrnl/fsrtl/name.c
@@ -28,59 +28,58 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression,
 
     while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR))
     {
-		if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) ||
-			(Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) ||
-			(Expression->Buffer[k] == DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0')))
-		{
-			i++;
-			k++;
-		}
-		else if (Expression->Buffer[k] == L'*')
-		{
-			if (k < Expression->Length / sizeof(WCHAR))
-			{
-				if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' &&
+      if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) ||
+          (Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) ||
+          (Expression->Buffer[k] == DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0')))
+      {
+        i++;
+        k++;
+      }
+      else if (Expression->Buffer[k] == L'*')
+      {
+        if (k < (Expression->Length / sizeof(WCHAR) - 1))
+        {
+          if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' &&
               Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM &&
-					Expression->Buffer[k+1] != DOS_STAR)
-				{
-					while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] &&
-						   i <= Name->Length / sizeof(WCHAR)) i++;
-				}
-				else
-				{
-					if (!(Expression->Buffer[k+1] != DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0')))
-					{
-						i++;
-					}
-				}
-			}
-			else
-			{
-				i = Name->Length / sizeof(WCHAR);
-			}
-			k++;
-		}
-		else if (Expression->Buffer[k] == DOS_STAR)
-		{
-			j = i;
-			while (j <= Name->Length / sizeof(WCHAR))
-			{
-				if (Name->Buffer[j] == L'.')
-				{
-					i = j;
-				}
-				j++;
-			}
-			k++;
-		}
-		else
-		{
-			i++;
-			k = 0;
-		}
+              Expression->Buffer[k+1] != DOS_STAR)
+          {
+            while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] &&
+                   i < Name->Length / sizeof(WCHAR)) i++;
+          }
+          else
+          {
+            if (!(Expression->Buffer[k+1] != DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0')))
+            {
+              i++;
+            }
+          }
+        }
+        else
+        {
+          i = Name->Length / sizeof(WCHAR);
+        }
+        k++;
+      }
+      else if (Expression->Buffer[k] == DOS_STAR)
+      {
+        j = i;
+        while (j < Name->Length / sizeof(WCHAR))
+        {
+          if (Name->Buffer[j] == L'.')
+          {
+            i = j;
+          }
+          j++;
+        }
+        k++;
+      }
+      else
+      {
+        i = Name->Length / sizeof(WCHAR);
+      }
     }
 
-    return (k == Expression->Length / sizeof(WCHAR));
+    return (k == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR));
 }
 
 /* PUBLIC FUNCTIONS **********************************************************/