From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 794F96F3D3; Tue, 30 Jun 2026 17:20:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 794F96F3D3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1782829238; bh=hXXmZElGGdEmFMnalAJNx4XyM8ovMfNWey+BHNwwTP0=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=xDRrl649rNzizuDVbp2gwfrBw04qg4ud8I/esZO8Y2iyQ3If9I+6FxCWkJJRt8twG KddBTom9dYaJc9gt/3XEAhgrmK4M9FvdCMwqT5pzkrNK6ljim/Zl40x5hyW9DBomwx mBhgRM3ubQQvm0Zp/Njkitwn4PM4YH72dSvhGjkQ= Received: from send128.i.mail.ru (send128.i.mail.ru [89.221.237.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 774BF6F3D3 for ; Tue, 30 Jun 2026 17:20:37 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 774BF6F3D3 Received: by exim-smtp-78b8b8c574-lj87z with esmtpa (envelope-from ) id 1weZKG-00000000G4T-1KZC; Tue, 30 Jun 2026 17:20:36 +0300 Content-Type: multipart/alternative; boundary="------------e8CFKsufX0jLgRVZB6TH7Nn5" Message-ID: <846468a8-0896-43b6-82fa-f475a8545e01@tarantool.org> Date: Tue, 30 Jun 2026 17:20:35 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Evgeniy Temirgaleev , Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org References: <31cfd9c3c72af4708b03b0ea98ca8a4e913b4599.1782588899.git.e.temirgaleev@tarantool.org> In-Reply-To: <31cfd9c3c72af4708b03b0ea98ca8a4e913b4599.1782588899.git.e.temirgaleev@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9F802F6E87846D5F65010D2D3A8C965C4540FE67E45426CC300894C459B0CD1B9A6CF7CE3ACB3F217479CDAE959BF6424CDACBEAB8B16690DB988E9CC9492245C6C831481B6BD6C10 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D6964C9E324ABA58EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667C07923B88CEC0ED4FD4DA3FC7EC3C0CA46DB3B5C183B368B3E4724F659A7911389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0ECC8AC47CD0EDEFF8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6E5E764EB5D94DBD4CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249CBD1B835A3D6DC2976E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8BBA0A059942E059D63AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735A3CCBC2573AEBDE1C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A52AD59F4BC7E593545002B1117B3ED6961E9DE9148110375E30C8F815570A3530823CB91A9FED034534781492E4B8EEAD47A3109F1ACFD409BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D6594CDEA57993FA842C3D940B148800F4E0846DE7485065901BC65A8B60187B2840430E0D46465006A8B8341EE9D5BE9A0AB764C7EBAD841CDCCD5EA42869DB2CB2A8EC29EFC29C52896536EB022892E5344C41F94D744909CE2512F26BEC029E55448553D2254B8D95CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVRSZSJkMhZtMKuVAuAxtEso= X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F258845871AFC55DC162E0B291CF6C6A8F7D6EF6147DC33C3560EEC3B4822C953424B137645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] Make check in os.time() consistent. X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------e8CFKsufX0jLgRVZB6TH7Nn5 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Evgeniy! Thanks for the patch! LGTM Sergey On 6/29/26 20:21, Evgeniy Temirgaleev wrote: > From: Mike Pall > > 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) --------------e8CFKsufX0jLgRVZB6TH7Nn5 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit

Hi, Evgeniy!

Thanks for the patch! LGTM

Sergey

On 6/29/26 20:21, Evgeniy Temirgaleev wrote:
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)
--------------e8CFKsufX0jLgRVZB6TH7Nn5--