shell32: Include NULL terminators in the lengths used by SHELL_ArgifyW.

eeeca570 · Vincent Povirk · Alexandre Julliard · 3d81e97c · eeeca570
Commit eeeca570 authored Jul 19, 2011 by Vincent Povirk Committed by Alexandre Julliard Jul 20, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

shlexec.c dlls/shell32/shlexec.c +6 -1

No files found.
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -269,7 +269,12 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp
        }
    }

-    *res = '\0';
+    used ++;
+    if (res - out < len)
+        *res = '\0';
+    else
+        out[len-1] = '\0';
+
    TRACE("used %i of %i space\n",used,len);
    if (out_len)
        *out_len = used;