From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: imeevma@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH v4 01/16] sql: remove MEM_Zero flag from struct MEM Date: Mon, 4 Oct 2021 23:51:42 +0200 [thread overview] Message-ID: <58315c1f-8fca-453f-0378-c451f4154cc9@tarantool.org> (raw) In-Reply-To: <d4c17c235f28ea9b6e38acaf7c3c249180bf33aa.1633092363.git.imeevma@gmail.com> Hi! Thanks for the patch! See 2 comments below. > diff --git a/src/box/sql/func.c b/src/box/sql/func.c > index 29d713fd0..ff0c461ce 100644 > --- a/src/box/sql/func.c > +++ b/src/box/sql/func.c > @@ -1272,11 +1272,19 @@ zeroblobFunc(sql_context * context, int argc, sql_value ** argv) > n = mem_get_int_unsafe(argv[0]); > if (n < 0) > n = 0; > - if (sql_result_zeroblob64(context, n) != 0) { > + if (n > sql_get()->aLimit[SQL_LIMIT_LENGTH]) { > diag_set(ClientError, ER_SQL_EXECUTE, "string or binary string"\ > "is too big"); > context->is_aborted = true; > + return; > + } > + char *str = sqlDbMallocRawNN(sql_get(), n); > + memset(str, 0, n); 1. There is sqlDbMallocZero(). > + if (str == NULL) { > + context->is_aborted = true; > + return; > } > + mem_set_bin_allocated(context->pOut, str, n); > } > > /* > diff --git a/src/box/sql/mem.c b/src/box/sql/mem.c > index 5e23c901c..24d6d7dbf 100644 > --- a/src/box/sql/mem.c > +++ b/src/box/sql/mem.c > @@ -1869,8 +1850,6 @@ mem_get_bin(const struct Mem *mem, const char **s) > *s = mem->n > 0 ? mem->z : NULL; > return 0; > } > - if (mem->type != MEM_TYPE_BIN || (mem->flags & MEM_Zero) != 0) > - return -1; 2. If the type is not MEM_TYPE_BIN, you will return garbage. Maybe keep return -1 for other types? > *s = mem->z; > return 0; > }
next prev parent reply other threads:[~2021-10-04 21:51 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-01 12:48 [Tarantool-patches] [PATCH v4 00/16] sql: refactor aggregate functions Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 01/16] sql: remove MEM_Zero flag from struct MEM Mergen Imeev via Tarantool-patches 2021-10-04 21:51 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-10-05 8:46 ` Mergen Imeev via Tarantool-patches 2021-10-05 9:42 ` Mergen Imeev via Tarantool-patches 2021-10-05 12:28 ` Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 02/16] sql: fix possible undefined behavior during cast Mergen Imeev via Tarantool-patches 2021-10-04 21:52 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-05 9:00 ` Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 03/16] sql: use register P1 for number of arguments Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 04/16] sql: remove AggStep0 and OP_BuiltinFunction0 Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 05/16] sql: move collation to struct sql_context Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 06/16] sql: introduce mem_append() Mergen Imeev via Tarantool-patches 2021-10-04 21:52 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-05 9:32 ` Mergen Imeev via Tarantool-patches 2021-10-11 21:50 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-19 10:49 ` Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 07/16] sql: remove sql_vdbemem_finalize() Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 08/16] sql: refactor SUM() function Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 09/16] sql: refactor TOTAL() function Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 10/16] sql: refactor AVG() function Mergen Imeev via Tarantool-patches 2021-10-04 21:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-05 9:48 ` Mergen Imeev via Tarantool-patches 2021-10-11 21:50 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-19 11:14 ` Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 11/16] sql: refactor COUNT() function Mergen Imeev via Tarantool-patches 2021-10-04 21:53 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-05 9:55 ` Mergen Imeev via Tarantool-patches 2021-10-11 21:51 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-19 11:17 ` Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 12/16] sql: refactor MIN() and MAX() functions Mergen Imeev via Tarantool-patches 2021-10-04 21:54 ` Vladislav Shpilevoy via Tarantool-patches 2021-10-05 10:07 ` Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 13/16] sql: refactor GROUP_CONCAT() function Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 14/16] sql: remove copying of result in finalizers Mergen Imeev via Tarantool-patches 2021-10-01 12:48 ` [Tarantool-patches] [PATCH v4 15/16] sql: remove MEM_TYPE_AGG Mergen Imeev via Tarantool-patches 2021-10-01 12:49 ` [Tarantool-patches] [PATCH v4 16/16] sql: remove field argv from struct sql_context Mergen Imeev via Tarantool-patches 2021-10-25 20:58 ` [Tarantool-patches] [PATCH v4 00/16] sql: refactor aggregate functions Vladislav Shpilevoy via Tarantool-patches 2021-10-26 10:34 Mergen Imeev via Tarantool-patches 2021-10-26 10:34 ` [Tarantool-patches] [PATCH v4 01/16] sql: remove MEM_Zero flag from struct MEM Mergen Imeev via Tarantool-patches
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=58315c1f-8fca-453f-0378-c451f4154cc9@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imeevma@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v4 01/16] sql: remove MEM_Zero flag from struct MEM' \ /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