From: Evgeniy Temirgaleev via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>,
Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit 2/2] Make check in os.time() consistent.
Date: Mon, 29 Jun 2026 20:21:57 +0300 [thread overview]
Message-ID: <31cfd9c3c72af4708b03b0ea98ca8a4e913b4599.1782588899.git.e.temirgaleev@tarantool.org> (raw)
In-Reply-To: <cover.1782588899.git.e.temirgaleev@tarantool.org>
From: Mike Pall <mike>
Thanks to Temir Galeev. #1470
(cherry picked from commit 295d45fb26de56498782c94594f31b97aef744ef)
This patch prevents os.time() to return nil, when machine time is -1
and some error occurs before os.time() call. In fact, this is
a theoretical case, so no tests were added.
Temir Galeev:
* added the description for the patch
Part of tarantool/tarantool#12480
---
src/lib_os.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib_os.c b/src/lib_os.c
index f6841357..d4054eae 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -229,6 +229,7 @@ LJLIB_CF(os_date)
LJLIB_CF(os_time)
{
time_t t;
+ errno = 0;
if (lua_isnoneornil(L, 1)) { /* called without args? */
t = time(NULL); /* get current time */
} else {
@@ -242,7 +243,6 @@ LJLIB_CF(os_time)
ts.tm_mon = getfield(L, "month", -1) - 1;
ts.tm_year = getfield(L, "year", -1) - 1900;
ts.tm_isdst = getboolfield(L, "isdst");
- errno = 0;
t = mktime(&ts);
}
if (t == (time_t)(-1) && errno != 0)
--
2.49.0
prev parent reply other threads:[~2026-06-29 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-29 17:16 [Tarantool-patches] [PATCH luajit 0/2] Fix os.time() to use errno to detect errors Evgeniy Temirgaleev via Tarantool-patches
2026-06-29 17:21 ` [Tarantool-patches] [PATCH luajit 1/2] Fix corner case of os.time() Evgeniy Temirgaleev via Tarantool-patches
2026-06-29 17:21 ` Evgeniy Temirgaleev via Tarantool-patches [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=31cfd9c3c72af4708b03b0ea98ca8a4e913b4599.1782588899.git.e.temirgaleev@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=e.temirgaleev@tarantool.org \
--cc=sergeyb@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit 2/2] Make check in os.time() consistent.' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox