Alex Henrie : wldap32: Handle null LDAPMessage in ldap_parse_result.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 68f91a82136377f33ba3bde473e8c87d912b8306
URL:    https://gitlab.winehq.org/wine/wine/-/commit/68f91a82136377f33ba3bde473e8c87...

Author: Alex Henrie 
Date:   Wed Mar 15 22:30:50 2023 -0600

wldap32: Handle null LDAPMessage in ldap_parse_result.

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

---

dlls/wldap32/parse.c       | 2 ++
 dlls/wldap32/tests/parse.c | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c
index 436d38d5c42..26e8de14c85 100644
--- a/dlls/wldap32/parse.c
+++ b/dlls/wldap32/parse.c
@@ -148,6 +148,7 @@ ULONG CDECL ldap_parse_resultA( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re
            free );

if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED;

ret = ldap_parse_resultW( ld, result, retcode, &matchedW, &errorW, &referralsW, &serverctrlsW, free );

@@ -177,6 +178,7 @@ ULONG CDECL ldap_parse_resultW( LDAP *ld, WLDAP32_LDAPMessage *result, ULONG *re
            free );

if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
+    if (!result) return WLDAP32_LDAP_NO_RESULTS_RETURNED;

ret = map_error( ldap_parse_result( CTX(ld), MSG(result), (int *)retcode, &matchedU, &errorU, &referralsU,
                                         &serverctrlsU, free ) );
diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c
index 161a0672cdc..375acbbe776 100644
--- a/dlls/wldap32/tests/parse.c
+++ b/dlls/wldap32/tests/parse.c
@@ -68,6 +68,12 @@ static void test_ldap_parse_sort_control( LDAP *ld )
     ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret );
     ok( res != NULL, "expected res != NULL\n" );

+    ret = ldap_parse_resultA( NULL, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret );
+    ret = ldap_parse_resultA( NULL, res, NULL, NULL, NULL, NULL, &server_ctrls, 0 );
+    ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA should fail, got %#lx\n", ret );
+    ret = ldap_parse_resultA( ld, NULL, NULL, NULL, NULL, NULL, &server_ctrls, 0 );
+    ok( ret == LDAP_NO_RESULTS_RETURNED, "ldap_parse_resultA should fail, got %#lx\n", ret );
     result = ~0u;
     ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 );
     ok( !ret, "ldap_parse_resultA failed %#lx\n", ret );