From dae3f838201a2be93f5bff2fdb3c9f9aabc3b747 Mon Sep 17 00:00:00 2001
From: Scott Wheeler <wheeler@kde.org>
Date: Sat, 16 Sep 2006 12:11:43 +0000
Subject: [PATCH] Invalid iterators are ungood.  Mmmkay?

CCMAIL:taglib-devel@kde.org


git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@585155 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ogg/xiphcomment.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ogg/xiphcomment.cpp b/ogg/xiphcomment.cpp
index 5c99f957..465817e7 100644
--- a/ogg/xiphcomment.cpp
+++ b/ogg/xiphcomment.cpp
@@ -196,9 +196,11 @@ void Ogg::XiphComment::removeField(const String &key, const String &value)
 {
   if(!value.isNull()) {
     StringList::Iterator it = d->fieldListMap[key].begin();
-    for(; it != d->fieldListMap[key].end(); ++it) {
+    while(it != d->fieldListMap[key].end()) {
       if(value == *it)
-        d->fieldListMap[key].erase(it);
+        it = d->fieldListMap[key].erase(it);
+      else
+        it++;
     }
   }
   else