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 EEC266F158; Mon, 29 Jun 2026 20:23:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EEC266F158 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1782753782; bh=8ySr+q8ZPWEi5Vd3gpeQutKSBq3Z4Xk9v2DuYHNG2os=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=DzJDVx5Ddm5bk9xxQt3vSiXuI5dAxYPjriS3MsF0IVncEUkkR2b7tK0fIqWTQIIB4 z/ZYZdTpZS+/ZTmsPdwNItLmAjSlYng3eRU3aILuTKsvl5QhpOZsBhV9SfJZZHYoU9 EufsGWnuuL+Muj+1oERw0hLeOTb775+jV/uAVctY= Received: from send104.i.mail.ru (send104.i.mail.ru [89.221.237.199]) (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 901786F158 for ; Mon, 29 Jun 2026 20:22:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 901786F158 Received: by exim-smtp-78b8b8c574-px96v with esmtpa (envelope-from ) id 1weFgt-000000005Ij-2wRW; Mon, 29 Jun 2026 20:22:40 +0300 To: Sergey Kaplun , Sergey Bronnikov Date: Mon, 29 Jun 2026 20:21:57 +0300 Message-ID: <31cfd9c3c72af4708b03b0ea98ca8a4e913b4599.1782588899.git.e.temirgaleev@tarantool.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD918D6BB028DF8CB61B1CEC85D1BD5B1A63B41DC0B9949CD63182A05F538085040F2E33604EC8239943DE06ABAFEAF67050AEAC54EA66500D87E79D6F974111BFD87D23EDDC3F839DD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C6068CE86C2B75F5EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667C07923B88CEC0EDD9315702ABFD076026B02A2C1A719D6F6EE05097476FAB3D389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C07734D68A6916D8318941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6BAA8CD687FCDB2EBCC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C22497D7908739D16C58076E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8BCB2D3143548416E53AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E73526B9191E2D567F0EC4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A5AE4F60E42519310F5002B1117B3ED696F85A82F9BA42497D1A1B8FE1FED62FE8823CB91A9FED034534781492E4B8EEADC0A73878EBD0941BC79554A2A72441328621D336A7BC284946AD531847A6065A17B107DEF921CE79BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659EE836396D39A12FBB9D98171B758849E342F8E2BD464D90ACADDC61115713D86192E1AB14671A517B8341EE9D5BE9A0A715D4956F3C5B1E7084EABBE745B82BE288F00ABB980BFF5C7CEAA0681F5848F4C41F94D744909CEEF9E35A692215F79327F81E6EEE0AEB67A0F9F91F029B6AF33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVRSZSJkMhZtMxavVM35XsWc= X-Mailru-Sender: 015BA6FC0EFA223A63A6570A1A03128596B78C01C2A07119B951B70A5BD4BD8E25187BBD0DD219DB83DC3CA5BA6FF409E62B12C1FE0372A178274A4A9E9E44FD2A114EDA040D8818F01FF9DF31C397A372D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: [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: Evgeniy Temirgaleev via Tarantool-patches Reply-To: Evgeniy Temirgaleev Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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) -- 2.49.0