From nobody Thu May 2 20:53:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VVmNk58dCz5K2Xr; Thu, 2 May 2024 20:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVmNk35Gbz43SR; Thu, 2 May 2024 20:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714683190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SwBS+RHwjjBxWmxfyrGovSW3cQ3+xVWemdh4qBKjpKU=; b=O/B71bMptfwJeeSecwgrmRHH0rEUbwX7Uaq3nefIFhUr0KZkz0fBxSty1lL9N9zgCQS+bJ +QD/o71bJB8S3yJf4hod06CFv3RvMcaoqhGMxKMrOs86eRsZftz0rHAIh0NaqrvO77sarO K1WbLam5bNleleDv2as6nsuP29AivUz6Azg9rUfnhIUtJfEYHZMFdWbchbdOydIew5DlhV hH/5UTWE6e5bScyUD5imfuyxuzG9CnQ7Kfq1lvREPxQnDx0sGZcy1zTBNVDGOmJoKwYePO eaZcUTL/6jSWzCtIxqk67bzwMtvO/BtoZhphqlwLwynmyqNnHSQZcN0bfDJi+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714683190; a=rsa-sha256; cv=none; b=IWIzzfqpGUUV69NXwV6lplwifgIdJqct20uSfexRCTqjpZO3R956O/kHv+fHhMwjx4XtmK RcEl40Q32ya3vIbxHWhx+8+vF2eEOpD/E510UcMQO6vhNTDW5/DjBmdGVBx+9wUOjIuFSl vsj4JfKMlB0IWPNMSrnn7hUY2zlK+gsS0eGf7m/wrRB+hi9iD/Otc0iYu1dQSABd8ovhj8 4VqCNzIvQMvDwpu7bHjACMiCE/tgAqnoSFBgEZPSSUU8CXIbQlI1WPWYh2/JdHHbqwpTzx iGN0mWdYsUk2HbA713EfKhvXmnfUiGhECFId6zwWboV+3MM4NBsHzZjL+OrhFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714683190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SwBS+RHwjjBxWmxfyrGovSW3cQ3+xVWemdh4qBKjpKU=; b=EZR+j19LiB0zq6VaPWT/2WrPa0o6+KfWtLmn89SPIgx5Hm43r/MhKjslQQF9f3xwlLDqC1 KxiKZPZ7FQYFVBoLbZmFsoC/JTaPosfphkt0t2/PH4RP0kpQwGFtJCcfLYUxLGqn8JwjAt kjlafOn25QWlZ1pc4ns2VKJoI87NUj3K/PA0iez/mUL3Jv2ZJiY3C/1Cj4kb2u2Ttsvtf/ u/WEE4Eh+EdqsB94nFbDL5GI10DixZHXf8KQFDx9C9RbNSfxeK+bPFoFbOClFb9sQWVt9t HdosNAGMgY84gBmqM1nllLWQMaBUR39bzG11aGmLI1DA9TLQ5FRJpKv6SQ07Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VVmNk2jddzHlq; Thu, 2 May 2024 20:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 442KrAAH040099; Thu, 2 May 2024 20:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442KrAnj040096; Thu, 2 May 2024 20:53:10 GMT (envelope-from git) Date: Thu, 2 May 2024 20:53:10 GMT Message-Id: <202405022053.442KrAnj040096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f2ec4bd306ac - stable/14 - date: Correctly check outcome of mktime(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f2ec4bd306ac786222bd5a6522b45e762e968b31 Auto-Submitted: auto-generated The branch stable/14 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=f2ec4bd306ac786222bd5a6522b45e762e968b31 commit f2ec4bd306ac786222bd5a6522b45e762e968b31 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-28 17:12:58 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-05-02 20:52:37 +0000 date: Correctly check outcome of mktime(). X-MFC-With: 7b390cb63689 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44982 (cherry picked from commit dafb424b8d44c7fdc9cfe876a79aad05c438def0) --- bin/date/date.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/date/date.c b/bin/date/date.c index 62703c6d70ac..6b6e1f69cabc 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -347,7 +347,9 @@ setthetime(const char *fmt, const char *p, int jflag, struct timespec *ts) } /* convert broken-down time to GMT clock time */ - if ((ts->tv_sec = mktime(lt)) == -1) + lt->tm_yday = -1; + ts->tv_sec = mktime(lt); + if (lt->tm_yday == -1) errx(1, "nonexistent time"); ts->tv_nsec = 0;