From fb52fd1c53f9adc7b6e0bcc8ab419739f894012f Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 21 Jan 2022 00:25:15 -0500
Subject: [PATCH] kadmin: kadmind_dispatch do not write to 'out' on error

1b213c1082be4ef5a1c23928d614c762f837dbe7 ("kadmind: Add missing
error checks") altered the behavior of kadmin_dispatch() such that
it unconditionally called

  krb5_storage_to_data(rsp, out);

Previously kadmin_dispatch() only wrote to 'out' on success.
Doing so is important because 'rsp' might be NULL on error.

Change-Id: I2688a5c47db0f94d955971e785037c578d3f3fa4
---
 kadmin/server.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kadmin/server.c b/kadmin/server.c
index dbd2f81b2..d1ed02b19 100644
--- a/kadmin/server.c
+++ b/kadmin/server.c
@@ -585,7 +585,8 @@ fail:
 	memset_s(password, len, 0, len);
 	free(password);
     }
-    krb5_storage_to_data(rsp, out);
+    if (ret == 0)
+	krb5_storage_to_data(rsp, out);
     krb5_storage_free(rsp);
     krb5_storage_free(sp);
     krb5_free_principal(contextp->context, princ);