From: Nikita Pettik <korablev@tarantool.org>
To: tarantool-patches@dev.tarantool.org
Cc: v.shpilevoy@tarantool.org
Subject: [Tarantool-patches] [PATCH 2/6] sql: fix possible null dereference in sql_expr_coll()
Date: Wed, 27 Nov 2019 15:15:42 +0300 [thread overview]
Message-ID: <1ca68695d7cd7d3d83f4b6829363ef533a23be38.1574846892.git.korablev@tarantool.org> (raw)
In-Reply-To: <cover.1574846892.git.korablev@tarantool.org>
In-Reply-To: <cover.1574846892.git.korablev@tarantool.org>
---
src/box/sql/expr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c
index 648b7170e..0bdcfe576 100644
--- a/src/box/sql/expr.c
+++ b/src/box/sql/expr.c
@@ -332,7 +332,8 @@ sql_expr_coll(Parse *parse, Expr *p, bool *is_explicit_coll, uint32_t *coll_id,
sql_func_by_signature(p->u.zToken, arg_count);
if (func == NULL)
break;
- if (sql_func_flag_is_set(func, SQL_FUNC_DERIVEDCOLL)) {
+ if (sql_func_flag_is_set(func, SQL_FUNC_DERIVEDCOLL) &&
+ arg_count > 0) {
/*
* Now we use quite straightforward
* approach assuming that resulting
--
2.15.1
next prev parent reply other threads:[~2019-11-27 12:15 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 12:15 [Tarantool-patches] [PATCH 0/6] sql: extend response metadata Nikita Pettik
2019-11-27 12:15 ` [Tarantool-patches] [PATCH 1/6] sql: refactor resulting set metadata Nikita Pettik
2019-11-28 22:41 ` Vladislav Shpilevoy
2019-12-05 11:39 ` Nikita Pettik
2019-12-05 23:58 ` Vladislav Shpilevoy
2019-12-06 12:48 ` Nikita Pettik
2019-12-17 13:23 ` Sergey Ostanevich
2019-11-27 12:15 ` Nikita Pettik [this message]
2019-11-28 22:42 ` [Tarantool-patches] [PATCH 2/6] sql: fix possible null dereference in sql_expr_coll() Vladislav Shpilevoy
2019-12-05 11:40 ` Nikita Pettik
2019-12-05 23:59 ` Vladislav Shpilevoy
2019-12-06 12:48 ` Nikita Pettik
2019-12-17 13:30 ` Sergey Ostanevich
2019-12-17 14:44 ` Nikita Pettik
2019-12-17 19:53 ` Nikita Pettik
2019-11-27 12:15 ` [Tarantool-patches] [PATCH 3/6] sql: extend result set with collation Nikita Pettik
2019-11-28 22:41 ` Vladislav Shpilevoy
2019-12-05 11:50 ` Nikita Pettik
2019-12-18 11:08 ` Sergey Ostanevich
2019-12-24 0:44 ` Nikita Pettik
2019-11-27 12:15 ` [Tarantool-patches] [PATCH 4/6] sql: extend result set with nullability Nikita Pettik
2019-11-28 22:41 ` Vladislav Shpilevoy
2019-12-05 11:50 ` Nikita Pettik
2019-12-06 0:00 ` Vladislav Shpilevoy
2019-12-06 12:49 ` Nikita Pettik
2019-12-18 13:31 ` Sergey Ostanevich
2019-11-27 12:15 ` [Tarantool-patches] [PATCH 5/6] sql: extend result set with autoincrement Nikita Pettik
2019-11-28 22:41 ` Vladislav Shpilevoy
2019-12-05 11:51 ` Nikita Pettik
2019-12-18 15:17 ` Sergey Ostanevich
2019-12-24 0:47 ` Nikita Pettik
2019-11-27 12:15 ` [Tarantool-patches] [PATCH 6/6] sql: extend result set with alias Nikita Pettik
2019-11-28 22:41 ` Vladislav Shpilevoy
2019-12-05 11:51 ` Nikita Pettik
2019-12-06 0:02 ` Vladislav Shpilevoy
2019-12-06 12:50 ` Nikita Pettik
2019-12-06 21:52 ` Vladislav Shpilevoy
2019-12-19 15:17 ` Sergey Ostanevich
2019-12-24 0:27 ` Nikita Pettik
2019-11-28 22:55 ` [Tarantool-patches] [PATCH 0/6] sql: extend response metadata Vladislav Shpilevoy
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=1ca68695d7cd7d3d83f4b6829363ef533a23be38.1574846892.git.korablev@tarantool.org \
--to=korablev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 2/6] sql: fix possible null dereference in sql_expr_coll()' \
/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