From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 28 Sep 2016 13:21:45 +0000 (+0200)
Subject: remove debug output and correct iterator increase
X-Git-Tag: dnsdist-1.1.0-beta2~108^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4504%2Fhead;p=thirdparty%2Fpdns.git

remove debug output and correct iterator increase
---

diff --git a/pdns/packetcache.cc b/pdns/packetcache.cc
index e523014f70..02f812a61b 100644
--- a/pdns/packetcache.cc
+++ b/pdns/packetcache.cc
@@ -420,8 +420,10 @@ void PacketCache::cleanup()
     unsigned int erased = 0, lookedAt = 0;
     for(auto i = sidx.begin(); i != sidx.end(); lookedAt++) {
       if(i->ttd < now) {
-        sidx.erase(i);
+        i = sidx.erase(i);
         erased++;
+      } else {
+        ++i;
       }
 
       if(toTrim && erased > toTrim / d_maps.size())
@@ -429,8 +431,6 @@ void PacketCache::cleanup()
 
       if(lookedAt > lookAt / d_maps.size())
         break;
-
-      i++;
     }
     totErased += erased;
   }