merge 20051 / 20052

Modified: branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c

--- branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c	2005-12-11 19:27:51 UTC (rev 20074)
+++ branches/ros-branch-0_2_9/reactos/lib/kernel32/misc/errormsg.c	2005-12-11 19:28:17 UTC (rev 20075)
@@ -177,6 +177,10 @@

     if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
     {
         from = HeapAlloc( GetProcessHeap(), 0, strlen((LPCSTR)lpSource)+1 );

+        if (from == NULL)
+        {
+            return 0;
+        }

         strcpy( from, (LPCSTR)lpSource );
     }
     else {