Fix more asprintf errors and error code paths.

Jeremy.

diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 215a310bbf4ecfc80fbef37db8a1d63070cbab37..291932d51a60e6f60babc0fcb211d4c08b91bdb0 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -603,7 +603,10 @@ got_connection:
                /* Must use the userPrincipalName value here or sAMAccountName
                   and not servicePrincipalName; found by Guenther Deschner */
 
-               asprintf(&ads->auth.user_name, "%s$", global_myname() );
+               if (asprintf(&ads->auth.user_name, "%s$", global_myname() ) == -1) {
+                       DEBUG(0,("ads_connect: asprintf fail.\n"));
+                       ads->auth.user_name = NULL;
+               }
        }
 
        if (!ads->auth.realm) {
@@ -619,10 +622,11 @@ got_connection:
        /* this is a really nasty hack to avoid ADS DNS problems. It needs a patch
           to MIT kerberos to work (tridge) */
        {
-               char *env;
-               asprintf(&env, "KRB5_KDC_ADDRESS_%s", ads->config.realm);
-               setenv(env, ads->auth.kdc_server, 1);
-               free(env);
+               char *env = NULL;
+               if (asprintf(&env, "KRB5_KDC_ADDRESS_%s", ads->config.realm) > 0) {
+                       setenv(env, ads->auth.kdc_server, 1);
+                       free(env);
+               }
        }
 #endif
 

diff --git a/source/libads/ldap_printer.c b/source/libads/ldap_printer.c
index 9935e2311a5b9f6d65cb1dd1f2bf7debf62a4630..eb6e3d3b100dddbe28d92d32fa29fb902e9681c0 100644 (file)
--- a/source/libads/ldap_printer.c
+++ b/source/libads/ldap_printer.c
@@ -31,7 +31,7 @@
                                       const char *servername)
 {
        ADS_STATUS status;
-       char *srv_dn, **srv_cn, *s;
+       char *srv_dn, **srv_cn, *s = NULL;
        const char *attrs[] = {"*", "nTSecurityDescriptor", NULL};
 
        status = ads_find_machine_acct(ads, res, servername);
@@ -41,25 +41,43 @@
                return status;
        }
        if (ads_count_replies(ads, *res) != 1) {
+               if (res) {
+                       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;
+               }
                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);
        }
-       ads_msgfree(ads, *res);
+       if (res) {
+               ads_msgfree(ads, *res);
+               *res = NULL;
+       }
 
-       asprintf(&s, "(cn=%s-%s)", srv_cn[0], printer);
+       if (asprintf(&s, "(cn=%s-%s)", srv_cn[0], printer) == -1) {
+               ldap_memfree(srv_dn);
+               return ADS_ERROR(LDAP_NO_MEMORY);
+       }
        status = ads_search(ads, res, s, attrs);
 
        ldap_memfree(srv_dn);
        ldap_value_free(srv_cn);
-       free(s);
+       SAFE_FREE(s);
        return status;  
 }