shell32: Check array index limit first.

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Check array index limit first.
0dddf2a1 · Andrey Gusev · Alexandre Julliard · 40b211b6 · 0dddf2a1 · 0dddf2a1
Commit 0dddf2a1 authored May 14, 2018 by Andrey Gusev Committed by Alexandre Julliard May 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shelllink.c dlls/shell32/shelllink.c +1 -1

xdg.c dlls/shell32/xdg.c +1 -1

No files found.
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -613,7 +613,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen )
    int len = 0, wlen;
    LPWSTR path;

-    while( p[len] && (len < maxlen) )
+    while( (len < maxlen) && p[len] )
        len++;

    wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0);

--- a/dlls/shell32/xdg.c
+++ b/dlls/shell32/xdg.c
@@ -341,7 +341,7 @@ static int dskentry_decode(const char *value, int len, char *output)
    while (pos<len)
    {
        char c;
-        if (value[pos] == '\\' && pos<len-1)
+        if (pos<len-1 && value[pos] == '\\')
        {
            pos++;
            switch (value[pos])