krb5 commit [krb5-1.14]: Fix iprop server stub error management

Tom Yu tlyu at mit.edu
Fri Jan 15 16:48:08 EST 2016


https://github.com/krb5/krb5/commit/2515f9ae54e28cbfa4ad42b94ced6b4bd43b054c
commit 2515f9ae54e28cbfa4ad42b94ced6b4bd43b054c
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Jan 14 17:51:53 2016 -0500

    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

 src/kadmin/server/ipropd_svc.c |    4 ----
 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"),


More information about the cvs-krb5 mailing list