wldap32: Handle null LDAPMessage in ldap_count_entries.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54690 (cherry picked from commit 65323a6b)

wldap32: Handle null LDAPMessage in ldap_count_entries.
c8078110 · Alex Henrie · Alexandre Julliard · b9dfdaf0 · c8078110 · c8078110
Commit c8078110 authored Mar 15, 2023 by Alex Henrie Committed by Alexandre Julliard Apr 19, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

misc.c dlls/wldap32/misc.c +1 -0

parse.c dlls/wldap32/tests/parse.c +7 -1

No files found.
--- a/dlls/wldap32/misc.c
+++ b/dlls/wldap32/misc.c
@@ -98,6 +98,7 @@ ULONG CDECL WLDAP32_ldap_count_entries( LDAP *ld, WLDAP32_LDAPMessage *res )
 {
    TRACE( "(%p, %p)\n", ld, res );

+    if (!res) return 0;
    if (!ld) return ~0u;
    return ldap_count_entries( CTX(ld), MSG(res) );
 }

--- a/dlls/wldap32/tests/parse.c
+++ b/dlls/wldap32/tests/parse.c
@@ -252,7 +252,13 @@ static void test_ldap_paged_search(void)
    ok( res != NULL, "expected res != NULL\n" );
    ok( count == 0, "got %lu\n", count );

-    count = ldap_count_entries( ld, res);
+    count = ldap_count_entries( NULL, NULL );
+    ok( count == 0, "got %lu\n", count );
+    count = ldap_count_entries( ld, NULL );
+    ok( count == 0, "got %lu\n", count );
+    count = ldap_count_entries( NULL, res );
+    todo_wine ok( count == 1, "got %lu\n", count );
+    count = ldap_count_entries( ld, res );
    ok( count == 1, "got %lu\n", count );

    entry = ldap_first_entry( ld, res);