odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48111Signed-off-by: Gijs Vermeulen <gijsvrm@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers.
3915b8d2 · Gijs Vermeulen · Alexandre Julliard · df3c911c · 3915b8d2 · 3915b8d2
Commit 3915b8d2 authored Nov 16, 2019 by Gijs Vermeulen Committed by Alexandre Julliard Nov 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

odbccp32.c dlls/odbccp32/odbccp32.c +2 -1

misc.c dlls/odbccp32/tests/misc.c +5 -0

No files found.
--- a/dlls/odbccp32/odbccp32.c
+++ b/dlls/odbccp32/odbccp32.c
@@ -583,7 +583,8 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout)
        return FALSE;
    }

-    *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL);
+    if (sizeout)
+        *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL);
    WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL);

    heap_free(wbuf);

--- a/dlls/odbccp32/tests/misc.c
+++ b/dlls/odbccp32/tests/misc.c
@@ -643,6 +643,11 @@ static void test_SQLGetInstalledDrivers(void)
    ok(!ret, "got %d\n", ret);
    check_error(ODBC_ERROR_INVALID_BUFF_LEN);

+    ret = SQLGetInstalledDrivers(buffer, 10, NULL);
+    ok(ret, "got %d\n", ret);
+    ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));
+    ok(!buffer[9], "buffer not doubly null-terminated\n");
+
    ret = SQLGetInstalledDrivers(buffer, 10, &written);
    ok(ret, "got %d\n", ret);
    ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));