[tarantool-patches] [PATCH v2 03/11] sql: fix leak on CREATE TABLE and resolve self ref

[Kirill Shcherbatov]

---
 src/box/sql.c       |  8 ++++++--
 src/box/sql/build.c | 14 +++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/box/sql.c b/src/box/sql.c
index 93fca68..72fd5cc 100644
--- a/src/box/sql.c
+++ b/src/box/sql.c
@@ -1860,8 +1860,12 @@ sql_checks_resolve_space_def_reference(ExprList *expr_list,
 	sql_parser_destroy(&parser);
 	if (parser.rc != SQLITE_OK) {
 		/* Tarantool error may be already set with diag. */
-		if (parser.rc != SQL_TARANTOOL_ERROR)
-			diag_set(ClientError, ER_SQL, parser.zErrMsg);
+		if (parser.rc != SQL_TARANTOOL_ERROR) {
+			char *error = tt_static_buf();
+			snprintf(error, TT_STATIC_BUF_LEN, "%s", parser.zErrMsg);
+			diag_set(ClientError, ER_SQL, error);
+			sqlite3DbFree(db, parser.zErrMsg);
+		}
 		return -1;
 	}
 	return 0;
diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index 28e4d7a..3c3c900 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -565,7 +565,7 @@ sqlite3StartTable(Parse *pParse, Token *pName, int noErr)
 	 */
 	if (!pParse->nested) {
 		if ((v = sqlite3GetVdbe(pParse)) == NULL)
-			goto begin_table_error;
+			goto cleanup;
 		sqlite3VdbeCountChanges(v);
 	}
 
@@ -575,7 +575,7 @@ sqlite3StartTable(Parse *pParse, Token *pName, int noErr)
 	if (zName == 0)
 		return;
 	if (sqlite3CheckIdentifierName(pParse, zName) != SQLITE_OK)
-		goto begin_table_error;
+		goto cleanup;
 
 	assert(db->pSchema != NULL);
 	pTable = sqlite3HashFind(&db->pSchema->tblHash, zName);
@@ -587,12 +587,12 @@ sqlite3StartTable(Parse *pParse, Token *pName, int noErr)
 		} else {
 			assert(!db->init.busy || CORRUPT_DB);
 		}
-		goto begin_table_error;
+		goto cleanup;
 	}
 
 	pTable = sql_table_new(pParse, zName);
 	if (pTable == NULL)
-		goto begin_table_error;
+		goto cleanup;
 
 	assert(pParse->pNewTable == 0);
 	pParse->pNewTable = pTable;
@@ -608,11 +608,7 @@ sqlite3StartTable(Parse *pParse, Token *pName, int noErr)
 	if (!db->init.busy && (v = sqlite3GetVdbe(pParse)) != 0)
 		sql_set_multi_write(pParse, true);
 
-	/* Normal (non-error) return. */
-	return;
-
-	/* If an error occurs, we jump here */
- begin_table_error:
+ cleanup:
 	sqlite3DbFree(db, zName);
 	return;
 }
-- 
2.7.4