diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index 39c86bca0a8e3f1dfcd523e15299e99d64850aa0..61519d90e0d23d5c8e530652504ed2b2fa4dab1a 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -1401,9 +1401,12 @@ vdbe_emit_stat_space_clear(struct Parse *parse, const char *stat_table_name,
 	assert(idx_name != NULL || table_name != NULL);
 	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);
+	struct SrcList *src_list = sql_src_list_new(db);
+	if (src_list == NULL) {
+		parse->is_aborted = true;
+		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);
@@ -2672,19 +2675,20 @@ sqlSrcListEnlarge(sql * db,	/* Database connection to notify of OOM errors */
 	return pSrc;
 }
 
-SrcList *
-sql_alloc_src_list(sql *db)
+struct SrcList *
+sql_src_list_new(struct sql *db)
 {
-	SrcList *pList;
-
-	pList = sqlDbMallocRawNN(db, sizeof(SrcList));
-	if (pList == 0)
+	struct SrcList *src_list = sqlDbMallocRawNN(db, sizeof(struct SrcList));
+	if (src_list == NULL) {
+		diag_set(OutOfMemory, sizeof(struct 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;
 }
 
 /*
@@ -2730,7 +2734,7 @@ sqlSrcListAppend(sql * db,	/* Connection to notify of malloc failures */
 	struct SrcList_item *pItem;
 	assert(db != 0);
 	if (pList == 0) {
-		pList = sql_alloc_src_list(db);
+		pList = sql_src_list_new(db);
 		if (pList == 0)
 			return 0;
 	} else {
diff --git a/src/box/sql/select.c b/src/box/sql/select.c
index 2ab4761a25ad3b4f240ee43670fc297b8330254c..96877fa5cb2df3b8ae7d6bcc187b6b3c7e52c9c4 100644
--- a/src/box/sql/select.c
+++ b/src/box/sql/select.c
@@ -315,7 +315,7 @@ sql_select_expand_from_tables(struct Select *select)
 {
 	assert(select != NULL);
 	struct Walker walker;
-	struct SrcList *table_names = sql_alloc_src_list(sql_get());
+	struct SrcList *table_names = sql_src_list_new(sql_get());
 	if (table_names == NULL)
 		return NULL;
 	memset(&walker, 0, sizeof(walker));
diff --git a/src/box/sql/sqlInt.h b/src/box/sql/sqlInt.h
index b8a8e75c086f8234ee99a121e29a1fc686e4b36e..629eb425827073e20508aec0d3f6cbf518ebc1e3 100644
--- a/src/box/sql/sqlInt.h
+++ b/src/box/sql/sqlInt.h
@@ -3419,8 +3419,17 @@ 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. The diag message is set.
+ */
+struct SrcList *
+sql_src_list_new(struct sql *db);
+
 SrcList *sqlSrcListAppend(sql *, SrcList *, Token *);
 SrcList *sqlSrcListAppendFromTerm(Parse *, SrcList *, Token *,
 				      Token *, Select *, Expr *, IdList *);