From: Stanislav Zudin <szudin@tarantool.org> To: tarantool-patches@freelists.org, vdavydov.dev@gmail.com Cc: Stanislav Zudin <szudin@tarantool.org> Subject: [PATCH 12/13] sql: fixes an error in uint64 to double casting Date: Fri, 15 Mar 2019 18:45:41 +0300 [thread overview] Message-ID: <d5d63a9722a97847eeedebbfd316b4dc8426732a.1552663061.git.szudin@tarantool.org> (raw) In-Reply-To: <cover.1552663061.git.szudin@tarantool.org> In-Reply-To: <cover.1552663061.git.szudin@tarantool.org> --- src/box/sql/util.c | 2 +- src/box/sql/vdbeInt.h | 2 ++ src/box/sql/vdbemem.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/box/sql/util.c b/src/box/sql/util.c index 17268aaaa..d585dc0d5 100644 --- a/src/box/sql/util.c +++ b/src/box/sql/util.c @@ -1318,7 +1318,7 @@ sqlAddInt64(i64 * pA, bool is_signedA, i64 iB, bool is_signedB) if (sum == INT64_MIN_MOD) { *pA = INT64_MIN; } else { - assert(sum < INT64_MAX); + assert(sum <= INT64_MAX); *pA = -(i64)sum; } return ATHR_SIGNED; diff --git a/src/box/sql/vdbeInt.h b/src/box/sql/vdbeInt.h index 42f22df52..2076a9a14 100644 --- a/src/box/sql/vdbeInt.h +++ b/src/box/sql/vdbeInt.h @@ -251,6 +251,8 @@ struct Mem { #define MEM_Unsigned 0x20000 /* Value is unsigned integer. * Combine this flag with MEM_Int * if necessary */ +#define MEM_UInt (MEM_Int | MEM_Unsigned) + #ifdef SQL_OMIT_INCRBLOB #undef MEM_Zero #define MEM_Zero 0x0000 diff --git a/src/box/sql/vdbemem.c b/src/box/sql/vdbemem.c index 2805d7a01..9e6d52b47 100644 --- a/src/box/sql/vdbemem.c +++ b/src/box/sql/vdbemem.c @@ -489,7 +489,7 @@ sqlVdbeRealValue(Mem * pMem, double *v) if (pMem->flags & MEM_Real) { *v = pMem->u.r; return 0; - } else if (pMem->flags & (MEM_Int | MEM_Unsigned)) { + } else if ((pMem->flags & MEM_UInt) == MEM_UInt) { *v = (double)(u64)pMem->u.i; return 0; } else if (pMem->flags & MEM_Int) { -- 2.17.1
next prev parent reply other threads:[~2019-03-15 15:45 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-15 15:45 [PATCH 00/13] sql: support -2^63 .. 2^64-1 integer type Stanislav Zudin 2019-03-15 15:45 ` [PATCH 01/13] sql: Convert big integers from string Stanislav Zudin 2019-03-25 15:10 ` [tarantool-patches] " n.pettik 2019-04-01 20:39 ` Stanislav Zudin 2019-04-02 7:27 ` Konstantin Osipov 2019-03-15 15:45 ` [PATCH 02/13] sql: make VDBE recognize big integers Stanislav Zudin 2019-03-25 15:11 ` [tarantool-patches] " n.pettik 2019-04-01 20:42 ` Stanislav Zudin 2019-04-02 7:38 ` [tarantool-patches] " Konstantin Osipov 2019-03-15 15:45 ` [PATCH 03/13] sql: removes unused function Stanislav Zudin 2019-03-25 15:11 ` [tarantool-patches] " n.pettik 2019-04-01 20:39 ` Stanislav Zudin 2019-03-15 15:45 ` [PATCH 04/13] sql: support big integers within sql binding Stanislav Zudin 2019-03-25 15:12 ` [tarantool-patches] " n.pettik 2019-04-01 20:42 ` Stanislav Zudin 2019-04-02 7:46 ` Konstantin Osipov 2019-04-02 7:44 ` [tarantool-patches] " Konstantin Osipov 2019-03-15 15:45 ` [PATCH 05/13] sql: removes redundant function Stanislav Zudin 2019-03-25 15:12 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 06/13] sql: aux functions to support big integers Stanislav Zudin 2019-03-25 15:13 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 07/13] sql: arithmetic functions " Stanislav Zudin 2019-03-25 15:13 ` [tarantool-patches] " n.pettik 2019-04-01 20:43 ` Stanislav Zudin 2019-04-02 7:54 ` Konstantin Osipov 2019-04-02 7:52 ` Konstantin Osipov 2019-03-15 15:45 ` [PATCH 08/13] sql: aggregate sql functions support big int Stanislav Zudin 2019-03-25 15:13 ` [tarantool-patches] " n.pettik 2019-04-01 20:43 ` Stanislav Zudin 2019-04-02 7:57 ` [tarantool-patches] " Konstantin Osipov 2019-03-15 15:45 ` [PATCH 09/13] sql: fixes errors Stanislav Zudin 2019-03-25 15:14 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 10/13] sql: fixes an error in sqlSubInt64 Stanislav Zudin 2019-03-25 15:14 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` [PATCH 11/13] sql: fixes an error in string to int64 conversion Stanislav Zudin 2019-03-25 15:14 ` [tarantool-patches] " n.pettik 2019-03-15 15:45 ` Stanislav Zudin [this message] 2019-03-25 15:15 ` [tarantool-patches] Re: [PATCH 12/13] sql: fixes an error in uint64 to double casting n.pettik 2019-03-15 15:45 ` [PATCH 13/13] sql: support -2^63 .. 2^64-1 integer type Stanislav Zudin 2019-03-25 15:25 ` [tarantool-patches] " n.pettik 2019-04-01 20:44 ` Stanislav Zudin 2019-03-25 15:10 ` [tarantool-patches] Re: [PATCH 00/13] " n.pettik 2019-04-01 20:38 ` Stanislav Zudin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d5d63a9722a97847eeedebbfd316b4dc8426732a.1552663061.git.szudin@tarantool.org \ --to=szudin@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=vdavydov.dev@gmail.com \ --subject='Re: [PATCH 12/13] sql: fixes an error in uint64 to double casting' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox