From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id ED24826669 for ; Fri, 13 Jul 2018 07:21:19 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K33h8ZbZySCr for ; Fri, 13 Jul 2018 07:21:19 -0400 (EDT) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 3AC4126665 for ; Fri, 13 Jul 2018 07:21:19 -0400 (EDT) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v1 1/1] lua: fix strange behaviour of tonumber64 Date: Fri, 13 Jul 2018 14:21:15 +0300 Message-Id: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: v.shpilevoy@tarantool.org, Kirill Shcherbatov Function tonumber64 has worked incorrectly with values less than LLONG_MIN. Now it works in the interval [LLONG_MIN, ULLONG_MAX] returning nil otherwise. Closes #3466. --- Branch: https://github.com/tarantool/tarantool/compare/kshch/gh-3466-tonumber64-strange-behaviour Issue: https://github.com/tarantool/tarantool/issues/3466 src/lua/init.c | 6 +++++- test/box/misc.result | 19 +++++++++++++++++++ test/box/misc.test.lua | 8 ++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/lua/init.c b/src/lua/init.c index 9a96030..4b5285d 100644 --- a/src/lua/init.c +++ b/src/lua/init.c @@ -222,7 +222,11 @@ lbox_tonumber64(struct lua_State *L) if (argl == 0) { lua_pushnil(L); } else if (negative) { - luaL_pushint64(L, -1 * (long long )result); + if (result > LLONG_MAX) { + lua_pushnil(L); + } else { + luaL_pushint64(L, -1 * result); + } } else { luaL_pushuint64(L, result); } diff --git a/test/box/misc.result b/test/box/misc.result index f332a8c..dcd08d0 100644 --- a/test/box/misc.result +++ b/test/box/misc.result @@ -640,6 +640,25 @@ tostring(tonumber64('1234567890123456')) == '1234567890123456ULL' --- - true ... +-- +-- gh-3466: Strange behaviour of tonumber64 function +-- +tostring(tonumber64('18446744073709551615')) == '18446744073709551615ULL' +--- +- true +... +tonumber64('18446744073709551616') == nil +--- +- true +... +tostring(tonumber64('-9223372036854775807')) == '-9223372036854775807LL' +--- +- true +... +tonumber64('-9223372036854775808') == nil +--- +- true +... tonumber64('0x12') == 18 --- - true diff --git a/test/box/misc.test.lua b/test/box/misc.test.lua index e24228a..4816235 100644 --- a/test/box/misc.test.lua +++ b/test/box/misc.test.lua @@ -165,6 +165,14 @@ tostring(tonumber64('12345678901234')) == '12345678901234' tostring(tonumber64('123456789012345')) == '123456789012345ULL' tostring(tonumber64('1234567890123456')) == '1234567890123456ULL' +-- +-- gh-3466: Strange behaviour of tonumber64 function +-- +tostring(tonumber64('18446744073709551615')) == '18446744073709551615ULL' +tonumber64('18446744073709551616') == nil +tostring(tonumber64('-9223372036854775807')) == '-9223372036854775807LL' +tonumber64('-9223372036854775808') == nil + tonumber64('0x12') == 18 tonumber64('0x12', 16) == 18 tonumber64('0x12', 17) == nil -- 2.7.4