Merge pull request #9073 from craigcitro/uint

dopplershift · web-flow · commit 0b95ba139ace · 2017-08-23T20:05:26.000-06:00
Fix two cases of signed integer overflow.
diff --git a/extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h b/extern/agg24-svn/include/agg_rasterizer_scanline_aa_nogamma.h
@@ -60,7 +60,7 @@ namespace agg
 
         int not_equal(int ex, int ey, const cell_aa&) const
         {
-            return (ex - x) | (ey - y);
+            return ex != x || ey != y;
         }
     };
 
diff --git a/extern/agg24-svn/include/agg_scanline_storage_aa.h b/extern/agg24-svn/include/agg_scanline_storage_aa.h
@@ -720,10 +720,10 @@ namespace agg
             m_ptr = m_data;
             if(m_ptr < m_end)
             {
-                m_min_x = read_int32() + m_dx; 
-                m_min_y = read_int32() + m_dy;
-                m_max_x = read_int32() + m_dx;
-                m_max_y = read_int32() + m_dy;
+                m_min_x = read_int32u() + m_dx;
+                m_min_y = read_int32u() + m_dy;
+                m_max_x = read_int32u() + m_dx;
+                m_max_y = read_int32u() + m_dy;
             }
             return m_ptr < m_end;
         }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ namespace agg`
`60`	`60`
`61`	`61`	`int not_equal(int ex, int ey, const cell_aa&) const`
`62`	`62`	`{`
`63`		`- return (ex - x) \| (ey - y);`
	`63`	`+ return ex != x \|\| ey != y;`
`64`	`64`	`}`
`65`	`65`	`};`
`66`	`66`