GetCPInfo should return FALSE if called with NULL info buffer.

11f2cb18 · Ulrich Czekalla · Alexandre Julliard · e10b5842 · 11f2cb18
Commit 11f2cb18 authored Mar 19, 2005 by Ulrich Czekalla Committed by Alexandre Julliard Mar 19, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

locale.c dlls/kernel/locale.c +8 -2

No files found.
--- a/dlls/kernel/locale.c
+++ b/dlls/kernel/locale.c
@@ -1302,9 +1302,15 @@ BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
 */
 BOOL WINAPI GetCPInfo( UINT codepage, LPCPINFO cpinfo )
 {
-    const union cptable *table = get_codepage_table( codepage );
+    const union cptable *table;
+
+    if (!cpinfo)
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return FALSE;
+    }

-    if (!table)
+    if (!(table = get_codepage_table( codepage )))
    {
        switch(codepage)
        {