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 CCA0423D48 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 8JIH-ZrcC2vL 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 86EDF2297D for ; Wed, 27 Feb 2019 06:13:22 -0500 (EST) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v2 2/7] sql: rework sql_src_list_enlarge to set diag Date: Wed, 27 Feb 2019 14:13:13 +0300 Message-Id: <73774bba8d68b70c0c6d5529ad30df4875370e87.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_src_list_enlarge 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 | 109 ++++++++++++++++--------------------------- src/box/sql/select.c | 28 ++++++----- src/box/sql/sqlInt.h | 27 ++++++++++- 3 files changed, 83 insertions(+), 81 deletions(-) diff --git a/src/box/sql/build.c b/src/box/sql/build.c index 3a65eb5a1..5337df450 100644 --- a/src/box/sql/build.c +++ b/src/box/sql/build.c @@ -2597,76 +2597,45 @@ sqlIdListIndex(IdList * pList, const char *zName) return -1; } -/* - * Expand the space allocazted for the given SrcList object by - * creating nExtra new slots beginning at iStart. iStart is zero based. - * New slots are zeroed. - * - * For example, suppose a SrcList initially contains two entries: A,B. - * To append 3 new entries onto the end, do this: - * - * sqlSrcListEnlarge(db, pSrclist, 3, 2); - * - * After the call above it would contain: A, B, nil, nil, nil. - * If the iStart argument had been 1 instead of 2, then the result - * would have been: A, nil, nil, nil, B. To prepend the new slots, - * the iStart value would be 0. The result then would - * be: nil, nil, nil, A, B. - * - * If a memory allocation fails the SrcList is unchanged. The - * db->mallocFailed flag will be set to true. - */ -SrcList * -sqlSrcListEnlarge(sql * db, /* Database connection to notify of OOM errors */ - SrcList * pSrc, /* The SrcList to be enlarged */ - int nExtra, /* Number of new slots to add to pSrc->a[] */ - int iStart /* Index in pSrc->a[] of first new slot */ - ) -{ - int i; - - /* Sanity checking on calling parameters */ - assert(iStart >= 0); - assert(nExtra >= 1); - assert(pSrc != 0); - assert(iStart <= pSrc->nSrc); - - /* Allocate additional space if needed */ - if ((u32) pSrc->nSrc + nExtra > pSrc->nAlloc) { - SrcList *pNew; - int nAlloc = pSrc->nSrc * 2 + nExtra; - int nGot; - pNew = sqlDbRealloc(db, pSrc, - sizeof(*pSrc) + (nAlloc - - 1) * - sizeof(pSrc->a[0])); - if (pNew == 0) { - assert(db->mallocFailed); - return pSrc; +struct SrcList * +sql_src_list_enlarge(struct sql *db, struct SrcList *src_list, int new_slots, + int start_idx) +{ + assert(start_idx >= 0); + assert(new_slots >= 1); + assert(src_list != NULL); + assert(start_idx <= src_list->nSrc); + + /* Allocate additional space if needed. */ + if (src_list->nSrc + new_slots > (int)src_list->nAlloc) { + int to_alloc = src_list->nSrc * 2 + new_slots; + int size = sizeof(*src_list) + + (to_alloc - 1) * sizeof(src_list->a[0]); + src_list = sqlDbRealloc(db, src_list, size); + if (src_list == NULL) { + diag_set(OutOfMemory, size, "sqlDbRealloc", "src_list"); + return NULL; } - pSrc = pNew; - nGot = - (sqlDbMallocSize(db, pNew) - - sizeof(*pSrc)) / sizeof(pSrc->a[0]) + 1; - pSrc->nAlloc = nGot; + src_list->nAlloc = + (sqlDbMallocSize(db, src_list) - + sizeof(*src_list)) / sizeof(src_list->a[0]) + 1;; } - /* Move existing slots that come after the newly inserted slots - * out of the way + /* + * Move existing slots that come after the newly inserted + * slots out of the way. */ - for (i = pSrc->nSrc - 1; i >= iStart; i--) { - pSrc->a[i + nExtra] = pSrc->a[i]; - } - pSrc->nSrc += nExtra; + for (int i = src_list->nSrc - 1; i >= start_idx; i--) + src_list->a[i + new_slots] = src_list->a[i]; + src_list->nSrc += new_slots; - /* Zero the newly allocated slots */ - memset(&pSrc->a[iStart], 0, sizeof(pSrc->a[0]) * nExtra); - for (i = iStart; i < iStart + nExtra; i++) { - pSrc->a[i].iCursor = -1; - } + /* Zero the newly allocated slots. */ + memset(&src_list->a[start_idx], 0, sizeof(src_list->a[0]) * new_slots); + for (int i = start_idx; i < start_idx + new_slots; i++) + src_list->a[i].iCursor = -1; - /* Return a pointer to the enlarged SrcList */ - return pSrc; + /* Return a pointer to the enlarged SrcList. */ + return src_list; } struct SrcList * @@ -2732,11 +2701,13 @@ sqlSrcListAppend(sql * db, /* Connection to notify of malloc failures */ if (pList == 0) return 0; } else { - pList = sqlSrcListEnlarge(db, pList, 1, pList->nSrc); - } - if (db->mallocFailed) { - sqlSrcListDelete(db, pList); - return 0; + struct SrcList *new_list = + sql_src_list_enlarge(db, pList, 1, pList->nSrc); + if (new_list == NULL) { + sqlSrcListDelete(db, pList); + return NULL; + } + pList = new_list; } pItem = &pList->a[pList->nSrc - 1]; pItem->zName = sqlNameFromToken(db, pTable); diff --git a/src/box/sql/select.c b/src/box/sql/select.c index 6a465a616..0baf8fb57 100644 --- a/src/box/sql/select.c +++ b/src/box/sql/select.c @@ -279,18 +279,22 @@ src_list_append_unique(struct sql *db, struct SrcList *list, if (name != NULL && strcmp(new_name, name) == 0) return list; } - list = sqlSrcListEnlarge(db, list, 1, list->nSrc); - if (db->mallocFailed) { - sqlSrcListDelete(db, list); - return NULL; - } + struct SrcList *new_list = + sql_src_list_enlarge(db, list, 1, list->nSrc); + if (new_list == NULL) + goto error; + list = new_list; struct SrcList_item *pItem = &list->a[list->nSrc - 1]; pItem->zName = sqlDbStrNDup(db, new_name, strlen(new_name)); if (pItem->zName == NULL) { - sqlSrcListDelete(db, list); - return NULL; + diag_set(OutOfMemory, strlen(new_name), "sqlDbStrNDup", + "pItem->zName"); + goto error; } return list; +error: + sqlSrcListDelete(db, list); + return NULL; } static int @@ -4135,12 +4139,14 @@ flattenSubquery(Parse * pParse, /* Parsing context */ * for the two elements in the FROM clause of the subquery. */ if (nSubSrc > 1) { - pParent->pSrc = pSrc = - sqlSrcListEnlarge(db, pSrc, nSubSrc - 1, - iFrom + 1); - if (db->mallocFailed) { + struct SrcList *new_list = + sql_src_list_enlarge(db, pSrc, nSubSrc - 1, + iFrom + 1); + if (new_list == NULL) { + sql_parser_error(pParse); break; } + pParent->pSrc = pSrc = new_list; } /* Transfer the FROM clause terms from the subquery into the diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h index ce29dc0b1..ea6476931 100644 --- a/src/box/sql/sqlInt.h +++ b/src/box/sql/sqlInt.h @@ -3426,7 +3426,32 @@ void sqlInsert(Parse *, SrcList *, Select *, IdList *, void *sqlArrayAllocate(sql *, void *, int, int *, int *); IdList *sqlIdListAppend(sql *, IdList *, Token *); int sqlIdListIndex(IdList *, const char *); -SrcList *sqlSrcListEnlarge(sql *, SrcList *, int, int); + +/** + * Expand the space allocated for the given SrcList object by + * creating new_slots new slots beginning at start_idx. + * The start_idx is zero based. New slots are zeroed. + * + * For example, suppose a SrcList initially contains two entries: + * A,B. + * To append 3 new entries onto the end, do this: + * sql_src_list_enlarge(db, pSrclist, 3, 2); + * + * After the call above it would contain: A, B, nil, nil, nil. + * If the iStart argument had been 1 instead of 2, then the result + * would have been: A, nil, nil, nil, B. To prepend the new slots, + * the iStart value would be 0. The result then would + * be: nil, nil, nil, A, B. + * @param db The database connection. + * @param src_list The SrcList to be enlarged. + * @param new_slots Number of new slots to add to src_list->a[]. + * @param start_idx Index in pSrc->a[] of first new slot. + * @retval not NULL SrcList pointer on success. + * @retval NULL otherwise. + */ +struct SrcList * +sql_src_list_enlarge(struct sql *db, struct SrcList *src_list, int new_slots, + int start_idx); /** * Allocate a new empty SrcList object. -- 2.20.1