tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix assertion failure in IdoMysqlConnection::FieldToEscapedString

Browse Source 
fixes #8865
This commit is contained in:
Gunnar Beutner 2015-03-26 07:10:52 +01:00
parent aaafbcbbac
commit a4852dae67
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -683,7 +683,8 @@ bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& va
if (DbValue::IsObjectInsertID(value)) { if (DbValue::IsObjectInsertID(value)) {
dbrefcol = GetInsertID(dbobjcol); dbrefcol = GetInsertID(dbobjcol);
ASSERT(dbrefcol.IsValid()); if (!dbrefcol.IsValid())
return false;
} else { } else {
dbrefcol = GetObjectID(dbobjcol); dbrefcol = GetObjectID(dbobjcol);
@ -750,8 +751,10 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
bool first = true; bool first = true;
BOOST_FOREACH(const Dictionary::Pair& kv, query.WhereCriteria) { BOOST_FOREACH(const Dictionary::Pair& kv, query.WhereCriteria) {
if (!FieldToEscapedString(kv.first, kv.second, &value)) if (!FieldToEscapedString(kv.first, kv.second, &value)) {
m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteQuery, this, query, (DbQueryType *)NULL));
return; return;
}
if (!first) if (!first)
where << " AND "; where << " AND ";