]> granicus.if.org Git - icinga2/commitdiff
Fix crash in Ido{Mysql,Pgsql}Connection::ExecuteMultipleQueries
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 21 Apr 2016 07:17:40 +0000 (09:17 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 21 Apr 2016 07:17:40 +0000 (09:17 +0200)
fixes #11639

lib/db_ido_mysql/idomysqlconnection.cpp
lib/db_ido_pgsql/idopgsqlconnection.cpp

index acfa1841e4c91a2987ca4760de2a0f9e26642eac..56c2767a8be8dcedc081e387643894e1f4037cef 100644 (file)
@@ -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);
 }
index c1b7295b14f7f68d58310c551021667595ef6ca1..a55f5fa647f09b94e024aba079bace04d9d5fd98 100644 (file)
@@ -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);
 }