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 EB1B16ECCD; Tue, 21 Jul 2026 10:59:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EB1B16ECCD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1784620798; bh=h4oY+kUSLt/KCNGenqs/7cthkpLsELFrhW2bh4QvZZc=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=mW02HzDxzkEkFjfWIxaR5RuQdV20m9fznjPVLaVgiziZM0da2JNDyNvIKqPNGbXCj 3n96pfvJIlyR4qTUmJ4HovRn24+rR1jtRQ5JWi84honymH1cOdnQp5OiXRvBwBPFJR oL1Dk4ijkpMUmVJC4s0FTn1Sxe9b/YHopD2RpMHo= Received: from send173.i.mail.ru (send173.i.mail.ru [95.163.59.12]) (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 D79006ECCD for ; Tue, 21 Jul 2026 10:59:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D79006ECCD Received: by exim-smtp-77575cb4cb-r8pqd with esmtpa (envelope-from ) id 1wm5OM-00000000ROh-2yyi; Tue, 21 Jul 2026 10:59:55 +0300 To: Sergey Bronnikov , Evgeniy Temirgaleev Date: Tue, 21 Jul 2026 10:59:39 +0300 Message-ID: <20260721075939.2894880-1-skaplun@tarantool.org> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9C2A6B03AB739174C5866D365A86F1DC53162EE6ACECCAEB000894C459B0CD1B9A9006C6C4F51195E03AAE3001806DF10CE298AFC20AC99B1D56730A3135DD9D2092611B121F4B2B0 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7DB45732B85BEE83BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB5533756628E6EC474EC885277FB1E3FA60BFFB2F35E2FA9F8A24A9DC4553E54E60021D5C389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C06030C3405640F6718941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6BAA8CD687FCDB2EBCC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB86D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7ED6B002596C5A4F0731C566533BA786AA5CC5B56E945C8DA X-87b9d050: 1 X-C1DE0DAB: 0D63561A33F958A510D08C8FDD49399B5002B1117B3ED696DAAF359967E179EDB2920F75BA9A967F823CB91A9FED034534781492E4B8EEADC3194D76C41E9723C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34C77DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D6593369C1895B22AE76B3E1992E1B232EB5A42D09F4AFC63BE7F42D681387856294A9FB3AA281782046B8341EE9D5BE9A0AF7BCC6B19F916A61AA4E9F7A10F48AC7DAE4754EF7017C1BC7CEAA0681F5848F4C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVWmxowtcrDwUMbERNNLZLHg= X-DA7885C5: 56498A553E0790F3F255D290C0D534F9890907D83F821216F34868930D0E122C801211780C8182335B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F7393520AF17B8A65FDE2EABAAFC1DB11AD713452C7ADD4751C05F1D77ABB53C98F28E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] Add compatibility string coercion for fp:seek() argument. 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 Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Mike Pall Reported by Magnus Wibeck. (cherry picked from commit d508715ab657261e8437a52c1b1966c20ab1631d) In LuaJIT the second `fp:seek()` argument (offset) doesn't coerce from a string to an integer value, unlike PUC-Rio Lua 5.1 does. This patch adds missing coercion. Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#12880 --- Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-1343-fseek-offset-coercion Related issues: * https://github.com/LuaJIT/LuaJIT/issues/1343 * https://github.com/tarantool/tarantool/issues/12880 src/Makefile.dep.original | 2 +- src/lib_io.c | 4 +++- .../lj-1343-fseek-offset-coercion.test.lua | 23 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 test/tarantool-tests/lj-1343-fseek-offset-coercion.test.lua diff --git a/src/Makefile.dep.original b/src/Makefile.dep.original index 436685f5..acc6b3ba 100644 --- a/src/Makefile.dep.original +++ b/src/Makefile.dep.original @@ -21,7 +21,7 @@ lib_ffi.o: lib_ffi.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \ lib_init.o: lib_init.c lua.h luaconf.h lauxlib.h lualib.h lmisclib.h lj_arch.h lib_io.o: lib_io.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \ lj_arch.h lj_gc.h lj_err.h lj_errmsg.h lj_buf.h lj_str.h lj_state.h \ - lj_strfmt.h lj_ff.h lj_ffdef.h lj_lib.h lj_libdef.h + lj_strfmt.h lj_ff.h lj_ffdef.h lj_lib.h lj_strscan.h lj_libdef.h lib_jit.o: lib_jit.c lua.h luaconf.h lauxlib.h lualib.h lj_obj.h lj_def.h \ lj_arch.h lj_gc.h lj_err.h lj_errmsg.h lj_debug.h lj_str.h lj_tab.h \ lj_state.h lj_bc.h lj_ctype.h lj_ir.h lj_jit.h lj_ircall.h lj_iropt.h \ diff --git a/src/lib_io.c b/src/lib_io.c index ef39e535..2d0abf78 100644 --- a/src/lib_io.c +++ b/src/lib_io.c @@ -25,6 +25,7 @@ #include "lj_strfmt.h" #include "lj_ff.h" #include "lj_lib.h" +#include "lj_strscan.h" /* Userdata payload for I/O file. */ typedef struct IOFileUD { @@ -317,13 +318,14 @@ LJLIB_CF(io_method_seek) FILE *fp = io_tofile(L)->fp; int opt = lj_lib_checkopt(L, 2, 1, "\3set\3cur\3end"); int64_t ofs = 0; - cTValue *o; + TValue *o; int res; if (opt == 0) opt = SEEK_SET; else if (opt == 1) opt = SEEK_CUR; else if (opt == 2) opt = SEEK_END; o = L->base+2; if (o < L->top) { + if (tvisstr(o)) lj_strscan_num(strV(o), o); if (tvisint(o)) ofs = (int64_t)intV(o); else if (tvisnum(o)) diff --git a/test/tarantool-tests/lj-1343-fseek-offset-coercion.test.lua b/test/tarantool-tests/lj-1343-fseek-offset-coercion.test.lua new file mode 100644 index 00000000..fdfc6ce5 --- /dev/null +++ b/test/tarantool-tests/lj-1343-fseek-offset-coercion.test.lua @@ -0,0 +1,23 @@ +local tap = require('tap') + +-- The test file to demonstrate LuaJIT's missing coercion for the +-- `io.fseek()` offset argument. +-- See also: https://github.com/LuaJIT/LuaJIT/issues/1343. + +local test = tap.test('lj-1343-fseek-offset-coercion') + +test:plan(2) + +local f = io.tmpfile() + +f:write('12345') + +f:seek('set', 0) +f:seek('set', '1') +test:is(f:read('*all'), '2345', 'base coercion test') + +f:seek('set', 0) +f:seek('set', '1.9') +test:is(f:read('*all'), '2345', 'coercion test for non-integer value') + +test:done(true) -- 2.55.0