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 804A86F152; Mon, 29 Jun 2026 20:22:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 804A86F152 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1782753750; bh=fEsa6y/9tjOmaj2OKC36lu3TUFcHKuDYUnWgQBqoatQ=; 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=PBio0CLlUyW9vP6CzS03ydXyTyEt5u70jBi45MyLzbrUncgASmOYVWCVb4DrxiF/N CjYhjjloZDZHHVrHK1HMaULwuETwmhjrfkKNq+Se0GJILojQtl5l0him+qbVkPzHOg bHLz2VccPDQUNl3yiQ2PIBbMHI43aHLHMf/YnbDI= Received: from send81.i.mail.ru (send81.i.mail.ru [89.221.237.176]) (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 E0C0C6F152 for ; Mon, 29 Jun 2026 20:22:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E0C0C6F152 Received: by exim-smtp-78b8b8c574-px96v with esmtpa (envelope-from ) id 1weFgi-000000005Ij-3m6D; Mon, 29 Jun 2026 20:22:29 +0300 To: Sergey Kaplun , Sergey Bronnikov Date: Mon, 29 Jun 2026 20:21:56 +0300 Message-ID: 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: 4F1203BC0FB41BD918D6BB028DF8CB61AC5A1B0F33293F2579E1CDB0117D0826182A05F5380850407349DE4B6FCFB8453DE06ABAFEAF670576450C7EE09C6F337E79D6F974111BFD7959C119149068A2 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78E8764B5BC580342EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375667C07923B88CEC0ED5D29F14D6246FD3126B02A2C1A719D6FE7338DDE2756B298389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0CB629EEF1311BF91D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BE2CCD8F0CAA010FB389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F7900637F25E68E770FF1CDDD81D268191BDAD3DBD4B6F7A4D31EC0BE2F48590F00D11D6D81D268191BDAD3D78DA827A17800CE7D216E7CBEE8B5135EC76A7562686271ED91E3A1F190DE8FD2E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3D13DC059A893E58D35872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A506CE10E1E7D13A8D5002B1117B3ED696BB377455A40D79A43E67C18142C611B7823CB91A9FED034534781492E4B8EEADEEA082C9A12FE455C79554A2A72441328621D336A7BC284946AD531847A6065AED8438A78DFE0A9EBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D65942DD0BEE6935FD8A390BEA26A302B2653829A9950C87511B008457D847AB381013CFFAFFDB68832BB8341EE9D5BE9A0AD7A7FE2CE09529BC084EABBE745B82BED0811DE1E0E98C65C7CEAA0681F5848F4C41F94D744909CEEF9E35A692215F79327F81E6EEE0AEB67A0F9F91F029B6AF33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVRSZSJkMhZtMFpqqRiGGxx4= X-Mailru-Sender: 015BA6FC0EFA223A63A6570A1A031285E95FB91C5B5C8322B951B70A5BD4BD8EB657B53800629DFD0E8F58CB380BC13FE62B12C1FE0372A178274A4A9E9E44FD2A114EDA040D8818F01FF9DF31C397A372D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 1/2] Fix corner case of os.time(). 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 72d2061ae2fa9a5fd45237943f9982baf59435ec) This patch fixes invalid os.time(t) behavior, when it handles -1 time value as a fail of the libc mktime() regardless of the errno value. Temir Galeev: * added the description and the test for the patch Part of tarantool/tarantool#12480 --- src/lib_os.c | 3 ++- .../lj-1470-os-time-epoch-minus-1s.test.lua | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/tarantool-tests/lj-1470-os-time-epoch-minus-1s.test.lua diff --git a/src/lib_os.c b/src/lib_os.c index ffbc3fdc..f6841357 100644 --- a/src/lib_os.c +++ b/src/lib_os.c @@ -242,9 +242,10 @@ 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)) + if (t == (time_t)(-1) && errno != 0) lua_pushnil(L); else lua_pushnumber(L, (lua_Number)t); diff --git a/test/tarantool-tests/lj-1470-os-time-epoch-minus-1s.test.lua b/test/tarantool-tests/lj-1470-os-time-epoch-minus-1s.test.lua new file mode 100644 index 00000000..6b5703e4 --- /dev/null +++ b/test/tarantool-tests/lj-1470-os-time-epoch-minus-1s.test.lua @@ -0,0 +1,12 @@ +local tap = require('tap') + +-- The test file demonstrates os.time() fail to return -1 time value. +-- See also: https://github.com/LuaJIT/LuaJIT/issues/1470. +local test = tap.test('lj-1470-os-time-epoch-minus-1s') + +test:plan(1) + +local minus_1s_time = os.date("*t", -1) +test:is(os.time(minus_1s_time), -1, 'correct os.time()') + +test:done(true) -- 2.49.0