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 6DA8E24E73 for ; Wed, 27 Feb 2019 06:13:22 -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 h2TFevFHyXu5 for ; Wed, 27 Feb 2019 06:13:22 -0500 (EST) 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 262A82297D for ; Wed, 27 Feb 2019 06:13:22 -0500 (EST) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v2 1/7] sql: refactor sql_alloc_src_list to set diag Date: Wed, 27 Feb 2019 14:13:12 +0300 Message-Id: <9bc544e742ad88f4fd6a3738fb4993d789832bc6.1551265819.git.kshcherbatov@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, v.shpilevoy@tarantool.org Cc: Kirill Shcherbatov Refactored sql_alloc_src_list routine to use diag_set in case of memory allocation error. This will ensure that the sqlSrcListAppend function throws an error using diag in subsequent patches. Needed for #3931 --- src/box/sql/build.c | 30 +++++++++++++++++------------- src/box/sql/sqlInt.h | 12 ++++++++++-- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/box/sql/build.c b/src/box/sql/build.c index e9851d9a1..3a65eb5a1 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -1397,8 +1397,11 @@ vdbe_emit_stat_space_clear(struct Parse *parse, const char *stat_table_name, struct sql *db = parse->db; assert(!db->mallocFailed); struct SrcList *src_list = sql_alloc_src_list(db); - if (src_list != NULL) - src_list->a[0].zName = sqlDbStrDup(db, stat_table_name); + if (src_list == NULL) { + sql_parser_error(parse); + return; + } + src_list->a[0].zName = sqlDbStrDup(db, stat_table_name); struct Expr *where = NULL; if (idx_name != NULL) { struct Expr *expr = sql_id_eq_str_expr(parse, "idx", idx_name); @@ -2666,19 +2669,20 @@ sqlSrcListEnlarge(sql * db, /* Database connection to notify of OOM errors */ return pSrc; } -SrcList * -sql_alloc_src_list(sql *db) +struct SrcList * +sql_alloc_src_list(struct sql *db) { - SrcList *pList; - - pList = sqlDbMallocRawNN(db, sizeof(SrcList)); - if (pList == 0) + struct SrcList *src_list = sqlDbMallocRawNN(db, sizeof(SrcList)); + if (src_list == NULL) { + diag_set(OutOfMemory, sizeof(SrcList), "sqlDbMallocRawNN", + "src_list"); return NULL; - pList->nAlloc = 1; - pList->nSrc = 1; - memset(&pList->a[0], 0, sizeof(pList->a[0])); - pList->a[0].iCursor = -1; - return pList; + } + src_list->nAlloc = 1; + src_list->nSrc = 1; + memset(&src_list->a[0], 0, sizeof(src_list->a[0])); + src_list->a[0].iCursor = -1; + return src_list; } /* diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index dbfdbc6f5..ce29dc0b1 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -3427,8 +3427,16 @@ void *sqlArrayAllocate(sql *, void *, int, int *, int *); IdList *sqlIdListAppend(sql *, IdList *, Token *); int sqlIdListIndex(IdList *, const char *); SrcList *sqlSrcListEnlarge(sql *, SrcList *, int, int); -SrcList * -sql_alloc_src_list(sql *db); + +/** + * Allocate a new empty SrcList object. + * @param db The database connection. + * @retval not NULL list pointer on success. + * @retval NULL otherwise. + */ +struct SrcList * +sql_alloc_src_list(struct sql *db); + SrcList *sqlSrcListAppend(sql *, SrcList *, Token *); SrcList *sqlSrcListAppendFromTerm(Parse *, SrcList *, Token *, Token *, Select *, Expr *, IdList *); -- 2.20.1