From 8a4ac3f07e3a60a8cf34fbe12b1b05219e865bf0 Mon Sep 17 00:00:00 2001
From: Deepak Bhole <dbhole@redhat.com>
Date: Wed, 24 Nov 2010 15:22:03 -0500
Subject: Fix PR593: Increment of invalidated iterator in IcedTeaPluginUtils
 (patch from barbara.xxx1975@libero.it)

---
 plugin/icedteanp/IcedTeaPluginUtils.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugin')

diff --git a/plugin/icedteanp/IcedTeaPluginUtils.cc b/plugin/icedteanp/IcedTeaPluginUtils.cc
index 501cd32..69daef2 100644
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc
@@ -510,11 +510,15 @@ IcedTeaPluginUtilities::invalidateInstance(NPP instance)
 
     std::map<void*,NPP>::iterator iterator;
 
-    for (iterator = instance_map->begin(); iterator != instance_map->end(); iterator++)
+    for (iterator = instance_map->begin(); iterator != instance_map->end(); )
     {
         if ((*iterator).second == instance)
         {
-            instance_map->erase((*iterator).first);
+            instance_map->erase(iterator++);
+        }
+        else
+        {
+            ++iterator;
         }
     }
 }
-- 
cgit v1.2.3