crypt32: Fix output buffer handling for CRYPT_STRING_BINARY case.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

crypt32: Fix output buffer handling for CRYPT_STRING_BINARY case.
5652a191 · Nikolay Sivov · Alexandre Julliard · d18d38bc · 5652a191
Commit 5652a191 authored Sep 26, 2018 by Nikolay Sivov Committed by Alexandre Julliard Sep 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

base64.c dlls/crypt32/base64.c +7 -10

No files found.
--- a/dlls/crypt32/base64.c
+++ b/dlls/crypt32/base64.c
@@ -77,23 +77,20 @@ static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary,
 {
    BOOL ret = TRUE;

-    if (*pcchString < cbBinary)
+    if (pszString)
    {
-        if (!pszString)
-            *pcchString = cbBinary;
-        else
+        if (*pcchString < cbBinary)
        {
            SetLastError(ERROR_INSUFFICIENT_BUFFER);
-            *pcchString = cbBinary;
            ret = FALSE;
        }
-    }
-    else
-    {
-        if (cbBinary)
+        else if (cbBinary)
            memcpy(pszString, pbBinary, cbBinary);
-        *pcchString = cbBinary;
    }
+    else
+
+    *pcchString = cbBinary;
+
    return ret;
 }