Issue 6281 - Don't return deleted entries

compiled/Map.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
   {
     typedef Entry entry_type;
     typedef HashContainerIterator<Entry> iterator;
 
     const entry_type* mPos;
     const entry_type* mEnd;
 
     explicit HashContainerIterator(const entry_type* start, const entry_type* end)
         : mPos(start), mEnd(end)
     {
-      if (mPos != mEnd && mPos->is_invalid())
+      if (mPos != mEnd && (mPos->is_invalid() || mPos->is_deleted()))
         ++(*this);
     }
 
     const entry_type& operator*() const
     {
       return *mPos;
     }
 
     const entry_type* operator->() const
     {
       return mPos;
     }
 
     iterator& operator++()
     {
       do {
         ++mPos;
-      } while(mPos != mEnd && mPos->is_invalid());
+      } while(mPos != mEnd && (mPos->is_invalid() || mPos->is_deleted()));
       return *this;
     }
 
     bool operator==(const iterator& it) const
     {
       return mPos == it.mPos;
     }
 
     bool operator!=(const iterator& it) const
     {
@@ skipping 13 matching lines @@
     {
     }
 
     const entry_type* operator->() const
     {
       return mEntry;
     }
 
     operator bool() const
     {
-      return !mEntry->is_invalid();
+      return !(mEntry->is_invalid() || mEntry->is_deleted());
     }
   };
 
   template<typename Entry>
   class HashContainer
   {
   public:
     typedef Entry entry_type;
     typedef typename Entry::key_type_cref key_type_cref;
     typedef typename entry_type::size_type size_type;
@@ skipping 228 matching lines @@
   {
     return super::find(key);
   }
 
   reference find(key_type_cref key)
   {
     return reference(this, key, super::find_bucket(key));
   }
 };
 
-ABP_NS_END
+ABP_NS_END