Fix invalid notification_id in DB IDO query

fixes #8976
Icinga · Dec 15, 2015 · 0239acc · 0239acc
1 parent da3d210
commit 0239acc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -682,13 +682,16 @@ bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& va
 	if (key == "instance_id") {
 		*result = static_cast<long>(m_InstanceID);
 		return true;
-	}
-	if (key == "session_token") {
+	} else if (key == "session_token") {
 		*result = m_SessionToken;
 		return true;
-	}
-	if (key == "notification_id") {
-		*result = static_cast<long>(GetNotificationInsertID(value));
+	} else if (key == "notification_id") {
+		DbReference ref = GetNotificationInsertID(value);
+
+		if (!ref.IsValid())
+			return false;
+
+		*result = static_cast<long>(ref);
 		return true;
 	}
 

diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -565,13 +565,16 @@ bool IdoPgsqlConnection::FieldToEscapedString(const String& key, const Value& va
 	if (key == "instance_id") {
 		*result = static_cast<long>(m_InstanceID);
 		return true;
-	}
-	if (key == "session_token") {
+	} else if (key == "session_token") {
 		*result = m_SessionToken;
 		return true;
-	}
-	if (key == "notification_id") {
-		*result = static_cast<long>(GetNotificationInsertID(value));
+	} else if (key == "notification_id") {
+		DbReference ref = GetNotificationInsertID(value);
+
+		if (!ref.IsValid())
+			return false;
+
+		*result = static_cast<long>(ref);
 		return true;
 	}