Date: Tue, 03 Feb 2026 19:10:06 +0000 From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin <jhb@FreeBSD.org> Subject: git: 70aab985c300 - stable/15 - heimdal: Pass the correct pointer to free in an error case Message-ID: <6982480e.3097b.628edb67@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=70aab985c30092483b5b32cdd3750570ec3d9364 commit 70aab985c30092483b5b32cdd3750570ec3d9364 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2026-01-31 17:00:44 +0000 Commit: Enji Cooper <ngie@FreeBSD.org> CommitDate: 2026-02-03 19:09:55 +0000 heimdal: Pass the correct pointer to free in an error case This fixes a warning reported by GCC 14 on stable/14: crypto/heimdal/lib/hdb/keys.c:241:13: warning: 'free' called on pointer 'ext' with nonzero offset 16 [-Wfree-nonheap-object] 241 | free(hist_keys); | ^~~~~~~~~~~~~~~ crypto/heimdal/lib/hdb/keys.c:234:15: note: returned from 'calloc' 234 | ext = calloc(1, sizeof (*ext)); | ^~~~~~~~~~~~~~~~~~~~~~~~ Reviewed by: rmacklem, cy Fixes: 5000d023a446 ("heimdal-kadmin: Add support for the -f dump option") Differential Revision: https://reviews.freebsd.org/D54932 (cherry picked from commit b26a7af438f36dcde86f39a681123cc2140affb2) --- crypto/heimdal/lib/hdb/keys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/heimdal/lib/hdb/keys.c b/crypto/heimdal/lib/hdb/keys.c index 9c0af5c47f23..ef6113610009 100644 --- a/crypto/heimdal/lib/hdb/keys.c +++ b/crypto/heimdal/lib/hdb/keys.c @@ -238,7 +238,7 @@ hdb_add_current_keys_to_history(krb5_context context, hdb_entry *entry) hist_keys = &ext->data.u.hist_keys; hist_keys->val = calloc(1, sizeof (*hist_keys->val)); if (hist_keys->val == NULL) { - free(hist_keys); + free(ext); return ENOMEM; } hist_keys->len = 1;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6982480e.3097b.628edb67>