s3: Fix Coverity ID 770, REVERSE_INULL
authorVolker Lendecke <vl@samba.org>
Mon, 21 Mar 2011 09:46:53 +0000 (10:46 +0100)
committerVolker Lendecke <vl@samba.org>
Mon, 21 Mar 2011 14:40:10 +0000 (15:40 +0100)
We dereference "res" in various places, no point in checking. All current
callers send "res!=NULL".

source3/libads/ldap_printer.c

index e4bfbcead7d43083c8d6a4b509ff22a53e783440..251dfb0a81548394f3b09be39a75d18251c6cd2d 100644 (file)
                return status;
        }
        if (ads_count_replies(ads, *res) != 1) {
-               if (res) {
-                       ads_msgfree(ads, *res);
-                       *res = NULL;
-               }
+               ads_msgfree(ads, *res);
+               *res = NULL;
                return ADS_ERROR(LDAP_NO_SUCH_OBJECT);
        }
        srv_dn = ldap_get_dn(ads->ldap.ld, *res);
        if (srv_dn == NULL) {
-               if (res) {
-                       ads_msgfree(ads, *res);
-                       *res = NULL;
-               }
+               ads_msgfree(ads, *res);
+               *res = NULL;
                return ADS_ERROR(LDAP_NO_MEMORY);
        }
        srv_cn = ldap_explode_dn(srv_dn, 1);
        if (srv_cn == NULL) {
                ldap_memfree(srv_dn);
-               if (res) {
-                       ads_msgfree(ads, *res);
-                       *res = NULL;
-               }
-               return ADS_ERROR(LDAP_INVALID_DN_SYNTAX);
-       }
-       if (res) {
                ads_msgfree(ads, *res);
                *res = NULL;
+               return ADS_ERROR(LDAP_INVALID_DN_SYNTAX);
        }
+       ads_msgfree(ads, *res);
+       *res = NULL;
 
        if (asprintf(&s, "(cn=%s-%s)", srv_cn[0], printer) == -1) {
                ldap_memfree(srv_dn);