aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2016-01-14 17:51:53 -0500
committerTom Yu <tlyu@mit.edu>2016-01-15 16:44:28 -0500
commit2515f9ae54e28cbfa4ad42b94ced6b4bd43b054c (patch)
tree7239826e458bd660d9073a316f8c4dd23688c88c
parentc8b2b0cd7b327b93d4be32b0132d9370c64f7665 (diff)
downloadkrb5-2515f9ae54e28cbfa4ad42b94ced6b4bd43b054c.zip
krb5-2515f9ae54e28cbfa4ad42b94ced6b4bd43b054c.tar.gz
krb5-2515f9ae54e28cbfa4ad42b94ced6b4bd43b054c.tar.bz2
Fix iprop server stub error management
The ipropd stubs free client_name and server_name in the cleanup handler, so should not free them in out-of-memory conditions. Reported by Will Fiveash. (cherry picked from commit d998b088adb875bc0a4e13c184075f91fb23336b) ticket: 8347 version_fixed: 1.14.1
-rw-r--r--src/kadmin/server/ipropd_svc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 4e79da6..7c7f850 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -163,8 +163,6 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp)
client_name = buf_to_string(&client_desc);
service_name = buf_to_string(&service_desc);
if (client_name == NULL || service_name == NULL) {
- free(client_name);
- free(service_name);
krb5_klog_syslog(LOG_ERR,
_("%s: out of memory recording principal names"),
whoami);
@@ -291,8 +289,6 @@ ipropx_resync(uint32_t vers, struct svc_req *rqstp)
client_name = buf_to_string(&client_desc);
service_name = buf_to_string(&service_desc);
if (client_name == NULL || service_name == NULL) {
- free(client_name);
- free(service_name);
DPRINT("%s: out of memory\n", whoami);
krb5_klog_syslog(LOG_ERR,
_("%s: out of memory recording principal names"),