From 66e738da77ff640f437e8b88de15bdf6678fa0f6 Mon Sep 17 00:00:00 2001
From: simonb <simonb>
Date: Thu, 10 Aug 2006 14:55:52 +0000
Subject: fix crash in ClientPattern

---
 ChangeLog            | 2 ++
 src/ClientPattern.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 80514e0..5eb71da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *06/08/10:
+   * Fix crash in ClientPattern when more than one pattern in [app] line (Simon)
+     ClientPattern.cc
    * Implement _NET_WM_WINDOW_TYPE_MENU and _NET_WM_WINDOW_TYPE_TOOLBAR (Mark)
      Ewmh.cc/hh
    * Fix duplicated UTF-8 encoding in el_GR (thanks Slava Semushin)
diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
index d9469fa..0016ea7 100644
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@@ -264,7 +264,7 @@ bool ClientPattern::equals(const ClientPattern &pat) const {
     Terms::const_iterator it_end = m_terms.end();
     Terms::const_iterator other_it = pat.m_terms.begin();
     Terms::const_iterator other_it_end = pat.m_terms.end();
-    for (; it != it_end, other_it != other_it_end; ++it, ++other_it) {
+    for (; it != it_end && other_it != other_it_end; ++it, ++other_it) {
         if ((*it)->orig != (*other_it)->orig)
             return false;
     }
-- 
cgit v0.11.2