[31602] in CVS-changelog-for-Kerberos-V5
krb5 commit: Change abort to error when encoding DB2 entry
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Mon Nov 2 22:43:53 2026
From: ghudson@mit.edu
To: cvs-krb5@mit.edu
Message-Id: <20261103034347.804341057F1@krbdev.mit.edu>
Date: Mon, 2 Nov 2026 22:43:47 -0500 (EST)
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/247b7a6e14252d24cb75ebb7c653bb6b8501b0b9
commit 247b7a6e14252d24cb75ebb7c653bb6b8501b0b9
Author: Greg Hudson <ghudson@mit.edu>
Date: Tue Jun 2 19:23:53 2026 -0400
Change abort to error when encoding DB2 entry
In krb5_encode_princ_entry(), return an error instead of aborting if
the len is field too small, as we do not generally use asserts or
aborts to detect calling errors.
src/plugins/kdb/db2/kdb_xdr.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/kdb/db2/kdb_xdr.c b/src/plugins/kdb/db2/kdb_xdr.c
index b4666a95b..7d04b267d 100644
--- a/src/plugins/kdb/db2/kdb_xdr.c
+++ b/src/plugins/kdb/db2/kdb_xdr.c
@@ -161,9 +161,11 @@ krb5_encode_princ_entry(krb5_context context, krb5_data *content,
krb5_kdb_encode_int16(entry->n_key_data, nextloc);
nextloc += 2;
- /* Put extended fields here */
- if (entry->len != KRB5_KDB_V1_BASE_LENGTH)
- abort();
+ if (entry->len != KRB5_KDB_V1_BASE_LENGTH) {
+ retval = KRB5_KDB_TRUNCATED_RECORD;
+ k5_setmsg(context, retval, _("KDB entry length must be at least %d"),
+ KRB5_KDB_V1_BASE_LENGTH);
+ }
/* Any extra data that this version doesn't understand. */
if (entry->e_length) {
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
