kernel32: Null-terminate the atom names passed to NtAddAtom.

Adobe Reader XI patches NtAddAtom() and expects the name to be null-terminated Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53872

kernel32: Null-terminate the atom names passed to NtAddAtom.
f181e25a · Evan Tang · Alexandre Julliard · b558c87c · f181e25a
Commit f181e25a authored Nov 02, 2022 by Evan Tang Committed by Alexandre Julliard Nov 04, 2022
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

atom.c dlls/kernel32/atom.c +3 -1

No files found.
--- a/dlls/kernel32/atom.c
+++ b/dlls/kernel32/atom.c
@@ -110,8 +110,10 @@ ATOM WINAPI GlobalAddAtomA( LPCSTR str /* [in] String to add */ )
    {
        if (!check_integral_atom( str, &atom ))
 	{
-	    WCHAR buffer[MAX_ATOM_LEN];
+	    /* Note: Adobe Reader XI in protected mode hijacks NtAddAtom and its replacement expects the string to be null terminated. */
+	    WCHAR buffer[MAX_ATOM_LEN+1];
 	    DWORD len = MultiByteToWideChar( CP_ACP, 0, str, strlen(str), buffer, MAX_ATOM_LEN );
+	    buffer[len] = 0;
 	    if (!len) SetLastError( ERROR_INVALID_PARAMETER );
 	    else if (!set_ntstatus( NtAddAtom( buffer, len * sizeof(WCHAR), &atom ))) atom = 0;
 	}