Jon Ciesla bf231a
From e269fe9b62af6fe314cebe0ee7a6d6d1a4a84d1c Mon Sep 17 00:00:00 2001
Jon Ciesla 599c4e
From: Tom Hughes <tom@compton.nu>
Jon Ciesla 599c4e
Date: Sun, 19 May 2013 11:03:26 +0100
Jon Ciesla bf231a
Subject: [PATCH 02/15] Cure recursion by aborting if the co-ordinates are to
Jon Ciesla 599c4e
 big to handle
Jon Ciesla 599c4e
Jon Ciesla 599c4e
---
Jon Ciesla 599c4e
 include/agg_rasterizer_cells_aa.h | 9 ++++++++-
Jon Ciesla 599c4e
 1 file changed, 8 insertions(+), 1 deletion(-)
Jon Ciesla 599c4e
Jon Ciesla 599c4e
diff --git a/include/agg_rasterizer_cells_aa.h b/include/agg_rasterizer_cells_aa.h
Jon Ciesla 599c4e
index d3bb138..3a616d9 100644
Jon Ciesla 599c4e
--- a/include/agg_rasterizer_cells_aa.h
Jon Ciesla 599c4e
+++ b/include/agg_rasterizer_cells_aa.h
Jon Ciesla 599c4e
@@ -40,7 +40,8 @@
Jon Ciesla 599c4e
 #define AGG_RASTERIZER_CELLS_AA_INCLUDED
Jon Ciesla 599c4e
 
Jon Ciesla 599c4e
 #include <string.h>
Jon Ciesla 599c4e
-#include <math.h>
Jon Ciesla 599c4e
+#include <cstdlib>
Jon Ciesla 599c4e
+#include <limits>
Jon Ciesla 599c4e
 #include "agg_math.h"
Jon Ciesla 599c4e
 #include "agg_array.h"
Jon Ciesla 599c4e
 
Jon Ciesla 599c4e
@@ -333,6 +334,12 @@ namespace agg
Jon Ciesla 599c4e
         {
Jon Ciesla 599c4e
             int cx = (x1 + x2) >> 1;
Jon Ciesla 599c4e
             int cy = (y1 + y2) >> 1;
Jon Ciesla 599c4e
+
Jon Ciesla 599c4e
+            // Bail if values are so large they are likely to wrap
Jon Ciesla 599c4e
+            if ((std::abs(x1) >= std::numeric_limits<int>::max()/2) || (std::abs(y1) >= std::numeric_limits<int>::max()/2) ||
Jon Ciesla 599c4e
+                (std::abs(x2) >= std::numeric_limits<int>::max()/2) || (std::abs(y2) >= std::numeric_limits<int>::max()/2))
Jon Ciesla 599c4e
+                    return;
Jon Ciesla 599c4e
+
Jon Ciesla 599c4e
             line(x1, y1, cx, cy);
Jon Ciesla 599c4e
             line(cx, cy, x2, y2);
Jon Ciesla 599c4e
         }
Jon Ciesla 599c4e
-- 
Jon Ciesla 599c4e
1.8.1.4
Jon Ciesla 599c4e