Date: Wed, 5 Nov 2025 16:33:52 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0a45aa9e954a - stable/15 - openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Message-ID: <202511051633.5A5GXqKZ047584@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a45aa9e954acc75484d59ad42ee440aa7f034c7 commit 0a45aa9e954acc75484d59ad42ee440aa7f034c7 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2025-10-31 17:04:51 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-11-05 16:33:06 +0000 openssh: Handle localtime_r() failure by return "UNKNOWN-TIME" Apply openssh-portable commit 8b6c1f402feb by deraadt@openbsd.org Obtained from: openssh-portable PR: 288773 Reported by: wosch Sponsored by: The FreeBSD Foundation (cherry picked from commit ce03706ab26c5770150f1ef96aca36b69baa535f) --- crypto/openssh/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index dd0bd032ae3c..1ed71646ebe4 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -2535,8 +2535,10 @@ format_absolute_time(uint64_t t, char *buf, size_t len) time_t tt = t > SSH_TIME_T_MAX ? SSH_TIME_T_MAX : t; struct tm tm; - localtime_r(&tt, &tm); - strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); + if (localtime_r(&tt, &tm) == NULL) + strlcpy(buf, "UNKNOWN-TIME", len); + else + strftime(buf, len, "%Y-%m-%dT%H:%M:%S", &tm); } /*home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511051633.5A5GXqKZ047584>