aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-08-10 14:55:52 (GMT)
committersimonb <simonb>2006-08-10 14:55:52 (GMT)
commit66e738da77ff640f437e8b88de15bdf6678fa0f6 (patch)
treee15b7425b63ded3a6be124d53faeacff8e3cccb8
parent839cc974c15381de184f7f6c51821784709ef99d (diff)
downloadfluxbox_paul-66e738da77ff640f437e8b88de15bdf6678fa0f6.zip
fluxbox_paul-66e738da77ff640f437e8b88de15bdf6678fa0f6.tar.bz2
fix crash in ClientPattern
-rw-r--r--ChangeLog2
-rw-r--r--src/ClientPattern.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 80514e0..5eb71da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/08/10: 3*06/08/10:
4 * Fix crash in ClientPattern when more than one pattern in [app] line (Simon)
5 ClientPattern.cc
4 * Implement _NET_WM_WINDOW_TYPE_MENU and _NET_WM_WINDOW_TYPE_TOOLBAR (Mark) 6 * Implement _NET_WM_WINDOW_TYPE_MENU and _NET_WM_WINDOW_TYPE_TOOLBAR (Mark)
5 Ewmh.cc/hh 7 Ewmh.cc/hh
6 * Fix duplicated UTF-8 encoding in el_GR (thanks Slava Semushin) 8 * 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 {
264 Terms::const_iterator it_end = m_terms.end(); 264 Terms::const_iterator it_end = m_terms.end();
265 Terms::const_iterator other_it = pat.m_terms.begin(); 265 Terms::const_iterator other_it = pat.m_terms.begin();
266 Terms::const_iterator other_it_end = pat.m_terms.end(); 266 Terms::const_iterator other_it_end = pat.m_terms.end();
267 for (; it != it_end, other_it != other_it_end; ++it, ++other_it) { 267 for (; it != it_end && other_it != other_it_end; ++it, ++other_it) {
268 if ((*it)->orig != (*other_it)->orig) 268 if ((*it)->orig != (*other_it)->orig)
269 return false; 269 return false;
270 } 270 }