From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 21 Apr 2016 07:17:40 +0000 (+0200)
Subject: Fix crash in Ido{Mysql,Pgsql}Connection::ExecuteMultipleQueries
X-Git-Tag: v2.5.0~364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a32211de26e796f098382c2a092e2f18ae8bca7;p=icinga2

Fix crash in Ido{Mysql,Pgsql}Connection::ExecuteMultipleQueries

fixes #11639
---

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index acfa1841e..56c2767a8 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -775,7 +775,8 @@ void IdoMysqlConnection::ExecuteQuery(const DbQuery& query)
 
 void IdoMysqlConnection::ExecuteMultipleQueries(const std::vector<DbQuery>& queries)
 {
-	ASSERT(!queries.empty());
+	if (queries.empty())
+		return;
 
 	m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteMultipleQueries, this, queries), queries[0].Priority, true);
 }
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index c1b7295b1..a55f5fa64 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -654,7 +654,8 @@ void IdoPgsqlConnection::ExecuteQuery(const DbQuery& query)
 
 void IdoPgsqlConnection::ExecuteMultipleQueries(const std::vector<DbQuery>& queries)
 {
-	ASSERT(!queries.empty());
+	if (queries.empty())
+		return;
 
 	m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::InternalExecuteMultipleQueries, this, queries), queries[0].Priority, true);
 }