fix iterator usage

willamowius · Nov 4, 2024 · 60810db · 60810db
1 parent 077cb83
commit 60810db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Toolkit.cxx b/Toolkit.cxx
@@ -841,11 +841,15 @@ int Toolkit::ProxyCriterion::SelectRoutingMode(const Address & ip1, const Addres
 		} else {
 			// on different networks, use maximum proxying
 			iter = m_modeselection.find(bestMatchIP1);
-			int mode1 = iter->second.fromExternal;	// no check, must exist
-			iter = m_modeselection.find(bestMatchIP2);
-			int mode2 = iter->second.fromExternal;	// no check, must exist
-			mode = max(mode1, mode2);
-			PTRACE(5, "ModeSelection: Both IPs on different networks: mode1=" << mode1 << " mode2=" << mode2 << " => " << mode);
+			if (iter != m_modeselection.end()) { // must exist
+				int mode1 = iter->second.fromExternal;
+				iter = m_modeselection.find(bestMatchIP2);
+				if (iter != m_modeselection.end()) { // must exist
+					int mode2 = iter->second.fromExternal;
+					mode = max(mode1, mode2);
+					PTRACE(5, "ModeSelection: Both IPs on different networks: mode1=" << mode1 << " mode2=" << mode2 << " => " << mode);
+				}
+			}
 		}
 	} else {
 		// only one rule, use that

diff --git a/changes.txt b/changes.txt
@@ -1,5 +1,6 @@
 Changes from 5.13 to 5.14
 =========================
+- BUGFIX(Toolkit.cxx) fix iterator usage (found by Coverity)
 
 Changes from 5.12 to 5.13
 =========================