Dmitry Timoshkov : wldap32: Handle NULL return in ldap_get_values_lenW.

Alexandre Julliard julliard at winehq.org
Tue Mar 24 15:28:15 CDT 2020


Module: wine
Branch: master
Commit: 3c3d0f6f004550832c52e0ab25d7c405213b3315
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3c3d0f6f004550832c52e0ab25d7c405213b3315

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon Mar 23 21:14:22 2020 +0800

wldap32: Handle NULL return in ldap_get_values_lenW.

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wldap32/value.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c
index bcfa9a2f6b..4e1701c926 100644
--- a/dlls/wldap32/value.c
+++ b/dlls/wldap32/value.c
@@ -229,12 +229,14 @@ PWCHAR * CDECL ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, P
     if (!attrU) return NULL;
 
     bv = ldap_get_values_len( ld, entry, attrU );
+    if (bv)
+    {
+        retU = bv2str_array( bv );
+        ret = strarrayUtoW( retU );
 
-    retU = bv2str_array( bv );
-    ret = strarrayUtoW( retU );
-
-    ldap_value_free_len( bv );
-    strarrayfreeU( retU );
+        ldap_value_free_len( bv );
+        strarrayfreeU( retU );
+    }
     strfreeU( attrU );
 
 #endif




More information about the wine-cvs mailing list