]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix iprop server stub error management
authorGreg Hudson <ghudson@mit.edu>
Thu, 14 Jan 2016 22:51:53 +0000 (17:51 -0500)
committerTom Yu <tlyu@mit.edu>
Fri, 15 Jan 2016 22:06:30 +0000 (17:06 -0500)
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.13.4
tags: -pullup
status: resolved

src/kadmin/server/ipropd_svc.c

index 06ecb6877d70fe104e0484a710c5a696599bfd28..802ffc2b20a59b9ef3fd91de9c15a151076113c0 100644 (file)
@@ -160,8 +160,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);
@@ -288,8 +286,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"),