wldap32: Return an error when ldap_parse_sort_control or ldap_parse_vlv_control…

wldap32: Return an error when ldap_parse_sort_control or ldap_parse_vlv_control is called with NULL control array.

wldap32: Return an error when ldap_parse_sort_control or ldap_parse_vlv_control…
927e9e08 · Hans Leidekker · Alexandre Julliard · a3c2c508 · 927e9e08
Commit 927e9e08 authored Oct 06, 2008 by Hans Leidekker Committed by Alexandre Julliard Oct 07, 2008
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

parse.c dlls/wldap32/parse.c +2 -6

No files found.
--- a/dlls/wldap32/parse.c
+++ b/dlls/wldap32/parse.c
@@ -333,12 +333,10 @@ ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
    TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr );
-    if (!ld) return ~0UL;
+    if (!ld || !control) return ~0UL;
-    if (control) {
    controlU = controlarrayWtoU( control );
    if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
-    }
 #ifdef HAVE_LDAP_PARSE_SORT_CONTROL
    if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU )))
@@ -439,12 +437,10 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
    TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos,
           listcount, context, errcode );
-    if (!ld) return ~0UL;
+    if (!ld || !control) return ~0UL;
-    if (control) {
    controlU = controlarrayWtoU( control );
    if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
-    }
 #ifdef HAVE_LDAP_PARSE_VLV_CONTROL
    if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,