- Add parameter validity check to GetTextFaceA (same as in GetTextFaceW)

svn path=/trunk/; revision=40473

diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c
index d26c7e6..93896d4 100644 (file)
--- a/reactos/dll/win32/gdi32/objects/text.c
+++ b/reactos/dll/win32/gdi32/objects/text.c
@@ -383,8 +383,19 @@ int
 WINAPI
 GetTextFaceA( HDC hdc, INT count, LPSTR name )
 {
 WINAPI
 GetTextFaceA( HDC hdc, INT count, LPSTR name )
 {

-    INT res = GetTextFaceW(hdc, 0, NULL);
-    LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 );
+    INT res;
+    LPWSTR nameW;
+
+    /* Validate parameters */
+    if (name && count <= 0)
+    {
+        /* Set last error and return failure */
+        GdiSetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    res = GetTextFaceW(hdc, 0, NULL);
+    nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 );

     GetTextFaceW( hdc, res, nameW );
 
     if (name)
     GetTextFaceW( hdc, res, nameW );
 
     if (name)