CompareStringW should return 0 when one of the provided strings is a

NULL pointer.

CompareStringW should return 0 when one of the provided strings is a
31a7cad4 · Alberto Massari · Alexandre Julliard · 0ca46dc3 · 31a7cad4
Commit 31a7cad4 authored Dec 19, 2002 by Alberto Massari Committed by Alexandre Julliard Dec 19, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

ole2nls.c ole/ole2nls.c +5 -0

No files found.
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -1255,6 +1255,11 @@ int WINAPI CompareStringW(LCID lcid, DWORD fdwStyle,
 	if(fdwStyle & NORM_IGNORESYMBOLS)
 		FIXME("IGNORESYMBOLS not supported\n");
+    if(s1==NULL || s2==NULL)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
 	/* Is strcmp defaulting to string sort or to word sort?? */
 	/* FIXME: Handle NORM_STRINGSORT */
 	l1 = (l1==-1)?strlenW(s1):l1;