Break potential infinite loop in msProjectSegment (MapServer#4961)

szekerest · Jul 23, 2014 · 54dda8c · 54dda8c
1 parent fc99472
commit 54dda8c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/mapproject.c b/mapproject.c
@@ -254,10 +254,18 @@ static int msProjectSegment( projectionObj *in, projectionObj *out,
 
     testPoint = midPoint;
 
-    if( msProjectPoint( in, out, &testPoint ) == MS_FAILURE )
+    if( msProjectPoint( in, out, &testPoint ) == MS_FAILURE ) {
+      if (midPoint.x == subEnd.x && midPoint.y == subEnd.y)
+        return MS_FAILURE; /* break infinite loop */
+
       subEnd = midPoint;
-    else
+    }
+    else {
+      if (midPoint.x == subStart.x && midPoint.y == subStart.y)
+        return MS_FAILURE; /* break infinite loop */
+
       subStart = midPoint;
+    }
   }
 
   /* -------------------------------------------------------------------- */