Remove possibility of buffer overrun in last commit.

mdboom · mdboom · commit 5e94e9e0c119 · 2008-07-17T18:25:20.000Z
svn path=/trunk/matplotlib/; revision=5776
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -75,14 +75,18 @@ class PathIterator
     {
         if (m_iterator >= m_total_vertices) return agg::path_cmd_stop;
         unsigned code = vertex_with_code(m_iterator++, x, y);
+
         if (MPL_isnan64(*x) || MPL_isnan64(*y)) {
-          do {
-            vertex(m_iterator++, x, y);
-          } while ((MPL_isnan64(*x) || MPL_isnan64(*y)) &&
-                   m_iterator < m_total_vertices);
-          return (m_iterator >= m_total_vertices) ? agg::path_cmd_stop :
-                                                    agg::path_cmd_move_to;
+            do {
+                if (m_iterator < m_total_vertices) {
+                    vertex(m_iterator++, x, y);
+                } else {
+                    return agg::path_cmd_stop;
+                }
+            } while (MPL_isnan64(*x) || MPL_isnan64(*y));
+            return agg::path_cmd_move_to;
         }
+
         return code;
     }
 
