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 1811D2594F for ; Tue, 22 Jan 2019 08:42:25 -0500 (EST) 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 YhYsfACPRKBH for ; Tue, 22 Jan 2019 08:42:25 -0500 (EST) Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 6028C21666 for ; Tue, 22 Jan 2019 08:42:24 -0500 (EST) Subject: [tarantool-patches] sql: assertion fault on VALUES (#3888) References: <16c923db-f9fc-1317-0468-fdb24740b1ff@tarantool.org> From: Stanislav Zudin Message-ID: <35ac4879-5140-15ea-6db8-1e61dbe687dd@tarantool.org> Date: Tue, 22 Jan 2019 16:42:21 +0300 MIME-Version: 1.0 In-Reply-To: <16c923db-f9fc-1317-0468-fdb24740b1ff@tarantool.org> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: en-US 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, "n.pettik" Branch: https://github.com/tarantool/tarantool/tree/2.1 Issue: https://github.com/tarantool/tarantool/issues/3888 From ff49a389a68488b13a0e3093fce9f51ac4c186bf Mon Sep 17 00:00:00 2001 From: Stanislav Zudin Date: Tue, 22 Jan 2019 15:41:26 +0300 Subject: [PATCH] sql: if a keyword 'blob' is used as an ID treat it as error Closes #3888 ---  src/box/sql/expr.c | 18 ++++++++++++++++--  1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/box/sql/expr.c b/src/box/sql/expr.c index b67b22c23..3eea7f4a3 100644 --- a/src/box/sql/expr.c +++ b/src/box/sql/expr.c @@ -3751,10 +3751,24 @@ sqlite3ExprCodeTarget(Parse * pParse, Expr * pExpr, int target)          }  #ifndef SQLITE_OMIT_BLOB_LITERAL      case TK_BLOB:{ -            int n; -            const char *z; +            int n = sqlite3Strlen30(pExpr->u.zToken); +            const char *z = pExpr->u.zToken;              char *zBlob; +              assert(!ExprHasProperty(pExpr, EP_IntValue)); + +            if ((n < 3) ||    /* 'X' + opening ' + closing ' == 3 */ +                (z[0] != 'x' && z[0] != 'X') || +                (z[1] != '\'') || (z[n - 1] != '\'')) { +                /* It's definitely not a blob, report an error. */ +                sqlite3ErrorMsg(pParse, +                            "Unexpected keyword '%s' within request", +                            z); +                sqlite3MayAbort(pParse); +                return 0; +            } + +            /* ---------------------------------------------- */              assert(pExpr->u.zToken[0] == 'x'                     || pExpr->u.zToken[0] == 'X');              assert(pExpr->u.zToken[1] == '\''); -- 2.17.1