From: Markus Moeller <huaraz@moeller.plus.com>
Date: Mon, 3 Nov 2014 03:42:31 +0000 (-0800)
Subject: Fix rev.13668 strdup uses and removes the safe_free
X-Git-Tag: merge-candidate-3-v1~511
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=581d42c4ba376e89b19d6c8e102e6a4b48825e8f;p=thirdparty%2Fsquid.git

Fix rev.13668 strdup uses and removes the safe_free

* use xstrdup() instead of strdup()

* replace safe_free() which should be just a setting to NULL.
---

diff --git a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc b/helpers/external_acl/kerberos_ldap_group/support_krb5.cc
index eb0bac05b5..240cbd00c6 100644
--- a/helpers/external_acl/kerberos_ldap_group/support_krb5.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_krb5.cc
@@ -99,7 +99,7 @@ krb5_create_cache(char *domain)
         }
     }
     if ( ccindex == -1 ) {
-        kparam.mem_ccache[kparam.ncache]=strdup(mem_cache);
+        kparam.mem_ccache[kparam.ncache]=xstrdup(mem_cache);
         ccindex=kparam.ncache;
         kparam.ncache++;
         if ( kparam.ncache == MAX_DOMAINS ) {
@@ -155,7 +155,7 @@ krb5_create_cache(char *domain)
                     }
                     if (creds)
                         krb5_free_creds(kparam.context, creds);
-                    safe_free(creds);
+                    creds = NULL;
                     safe_free(principal_name);
                     debug((char *) "%s| %s: DEBUG: Reset credential cache to %s\n", LogTime(), PROGRAM, mem_cache);
                     code = krb5_cc_resolve(kparam.context, mem_cache, &kparam.cc[ccindex]);
diff --git a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
index 7c37ba89b0..3afe03cbcd 100644
--- a/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
+++ b/helpers/external_acl/kerberos_ldap_group/support_ldap.cc
@@ -1239,11 +1239,11 @@ get_memberof(struct main_args *margs, char *user, char *domain, char *group)
                         snprintf(search_exp, se_len, "%s", FILTER_SID_1 );
 
                         for (int j=0; j<len; j++) {
-                            se=strdup(search_exp);
+                            se=xstrdup(search_exp);
                             snprintf(search_exp, se_len, "%s\\%02x", se, attr_value_3[0][j] & 0xFF);
                             xfree(se);
                         }
-                        se=strdup(search_exp);
+                        se=xstrdup(search_exp);
                         snprintf(search_exp, se_len, "%s%s", se, FILTER_SID_2 );
                         xfree(se);