# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1296120399 18000
# Node ID 40be4f07b3b5fa2330a022f00b4c894e4905fe21
# Parent  077ece977a7b6a15d3207fe67912c89b9b214ce8
input.cc (input_event_hook): fix incorrect use of iterator

diff -r 077ece977a7b -r 40be4f07b3b5 src/ChangeLog
--- a/src/ChangeLog	Thu Jan 27 04:22:53 2011 -0500
+++ b/src/ChangeLog	Thu Jan 27 04:26:39 2011 -0500
@@ -1,3 +1,8 @@
+2011-01-27  John W. Eaton  <jwe@octave.org>
+
+	* input.cc (input_event_hook): Fix incorrect use of iterator.
+	Reported by Pascal Dupuis <Pascal.Dupuis@worldonline.be>.
+
 2011-01-27  John W. Eaton  <jwe@octave.org>
 
 	* ov-class.cc (octave_class::reconstruct_exemplar):
diff -r 077ece977a7b -r 40be4f07b3b5 src/input.cc
--- a/src/input.cc	Thu Jan 27 04:22:53 2011 -0500
+++ b/src/input.cc	Thu Jan 27 04:26:39 2011 -0500
@@ -1255,7 +1255,7 @@
           std::string hook_fcn = p->first;
           octave_value user_data = p->second;
 
-          p++;
+          hook_fcn_map_type::iterator q = p++;
 
           if (is_valid_function (hook_fcn))
             {
@@ -1265,7 +1265,7 @@
                 feval (hook_fcn, octave_value_list (), 0);
             }
           else
-            hook_fcn_map.erase (p);
+            hook_fcn_map.erase (q);
         }
 
       if (hook_fcn_map.empty ())