From f52b36d570ff18969052c7eab7a7f82241e985d2 Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Thu, 29 Dec 2005 12:40:31 +0000
Subject: [PATCH] IntRegisterClass did not check for NULL pointer when it alloc
 memory.

svn path=/trunk/; revision=20419
---
 reactos/subsys/win32k/ntuser/class.c | 35 +++++++++++++++++-----------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/class.c b/reactos/subsys/win32k/ntuser/class.c
index ae3b7446be9..70f15fc523a 100644
--- a/reactos/subsys/win32k/ntuser/class.c
+++ b/reactos/subsys/win32k/ntuser/class.c
@@ -208,6 +208,27 @@ IntRegisterClass(
    Class->hIconSm = lpwcx->hIconSm;
    Class->Atom = Atom;
    
+   if (MenuName->Length == 0)
+   {
+      Class->lpszMenuName.Length =
+         Class->lpszMenuName.MaximumLength = 0;
+      Class->lpszMenuName.Buffer = MenuName->Buffer;
+   }
+   else
+   {
+      Class->lpszMenuName.Length =
+         Class->lpszMenuName.MaximumLength = MenuName->MaximumLength;
+      Class->lpszMenuName.Buffer = ExAllocatePoolWithTag(PagedPool, Class->lpszMenuName.MaximumLength, TAG_STRING);
+      
+      if (Class->lpszMenuName.Buffer == NULL) 
+      {
+         SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+         return(FALSE);
+      }
+      
+      RtlCopyUnicodeString(&Class->lpszMenuName, MenuName);
+   }
+   
    if (wpExtra == NULL)
    {
       if (Flags & REGISTERCLASS_ANSI)
@@ -235,19 +256,7 @@ IntRegisterClass(
       }
    }
    
-   if (MenuName->Length == 0)
-   {
-      Class->lpszMenuName.Length =
-         Class->lpszMenuName.MaximumLength = 0;
-      Class->lpszMenuName.Buffer = MenuName->Buffer;
-   }
-   else
-   {
-      Class->lpszMenuName.Length =
-         Class->lpszMenuName.MaximumLength = MenuName->MaximumLength;
-      Class->lpszMenuName.Buffer = ExAllocatePoolWithTag(PagedPool, Class->lpszMenuName.MaximumLength, TAG_STRING);
-      RtlCopyUnicodeString(&Class->lpszMenuName, MenuName);
-   }
+  
    
    /* Extra class data */
    if (Class->cbClsExtra)