Merge pull request #16975 from vitalybuka/bounds

story645 · web-flow · commit 1ca210c1eb82 · 2020-04-30T16:52:46.000-04:00
Fix "out of bounds" undefined behavior
diff --git a/extern/agg24-svn/include/agg_pixfmt_gray.h b/extern/agg24-svn/include/agg_pixfmt_gray.h
@@ -136,14 +136,13 @@ namespace agg
         typedef typename color_type::calc_type    calc_type;
         enum 
         {
-            num_components = 1,
             pix_width = sizeof(value_type) * Step,
             pix_step = Step,
             pix_offset = Offset,
         };
         struct pixel_type
         {
-            value_type c[num_components];
+            value_type c[pix_step];
 
             void set(value_type v)
             {
@@ -167,22 +166,22 @@ namespace agg
 
             pixel_type* next()
             {
-                return (pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             const pixel_type* next() const
             {
-                return (const pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             pixel_type* advance(int n)
             {
-                return (pixel_type*)(c + n * pix_step);
+                return this + n;
             }
 
             const pixel_type* advance(int n) const
             {
-                return (const pixel_type*)(c + n * pix_step);
+                return this + n;
             }
         };
 
diff --git a/extern/agg24-svn/include/agg_pixfmt_rgb.h b/extern/agg24-svn/include/agg_pixfmt_rgb.h
@@ -192,14 +192,13 @@ namespace agg
         typedef typename color_type::calc_type calc_type;
         enum 
         {
-            num_components = 3,
             pix_step = Step,
             pix_offset = Offset,
             pix_width = sizeof(value_type) * pix_step
         };
         struct pixel_type
         {
-            value_type c[num_components];
+            value_type c[pix_step];
 
             void set(value_type r, value_type g, value_type b)
             {
@@ -230,22 +229,22 @@ namespace agg
 
             pixel_type* next()
             {
-                return (pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             const pixel_type* next() const
             {
-                return (const pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             pixel_type* advance(int n)
             {
-                return (pixel_type*)(c + n * pix_step);
+                return this + n;
             }
 
             const pixel_type* advance(int n) const
             {
-                return (const pixel_type*)(c + n * pix_step);
+                return this + n;
             }
         };
 
diff --git a/extern/agg24-svn/include/agg_pixfmt_rgba.h b/extern/agg24-svn/include/agg_pixfmt_rgba.h
@@ -1515,13 +1515,12 @@ namespace agg
         typedef typename color_type::calc_type calc_type;
         enum 
         {
-            num_components = 4,
             pix_step = 4,
             pix_width = sizeof(value_type) * pix_step,
         };
         struct pixel_type
         {
-            value_type c[num_components];
+            value_type c[pix_step];
 
             void set(value_type r, value_type g, value_type b, value_type a)
             {
@@ -1555,22 +1554,22 @@ namespace agg
 
             pixel_type* next()
             {
-                return (pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             const pixel_type* next() const
             {
-                return (const pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             pixel_type* advance(int n)
             {
-                return (pixel_type*)(c + n * pix_step);
+                return this + n;
             }
 
             const pixel_type* advance(int n) const
             {
-                return (const pixel_type*)(c + n * pix_step);
+                return this + n;
             }
         };
 
@@ -2193,13 +2192,12 @@ namespace agg
         typedef typename color_type::calc_type calc_type;
         enum 
         {
-            num_components = 4,
             pix_step = 4,
             pix_width  = sizeof(value_type) * pix_step,
         };
         struct pixel_type
         {
-            value_type c[num_components];
+            value_type c[pix_step];
 
             void set(value_type r, value_type g, value_type b, value_type a)
             {
@@ -2233,22 +2231,22 @@ namespace agg
 
             pixel_type* next()
             {
-                return (pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             const pixel_type* next() const
             {
-                return (const pixel_type*)(c + pix_step);
+                return this + 1;
             }
 
             pixel_type* advance(int n)
             {
-                return (pixel_type*)(c + n * pix_step);
+                return this + n;
             }
 
             const pixel_type* advance(int n) const
             {
-                return (const pixel_type*)(c + n * pix_step);
+                return this + n;
             }
         };
 

Original file line number	Diff line number	Diff line change
`@@ -136,14 +136,13 @@ namespace agg`
`136`	`136`	`typedef typename color_type::calc_type calc_type;`
`137`	`137`	`enum`
`138`	`138`	`{`
`139`		`- num_components = 1,`
`140`	`139`	`pix_width = sizeof(value_type) * Step,`
`141`	`140`	`pix_step = Step,`
`142`	`141`	`pix_offset = Offset,`
`143`	`142`	`};`
`144`	`143`	`struct pixel_type`
`145`	`144`	`{`
`146`		`- value_type c[num_components];`
	`145`	`+ value_type c[pix_step];`
`147`	`146`
`148`	`147`	`void set(value_type v)`
`149`	`148`	`{`
`@@ -167,22 +166,22 @@ namespace agg`
`167`	`166`
`168`	`167`	`pixel_type* next()`
`169`	`168`	`{`
`170`		`- return (pixel_type*)(c + pix_step);`
	`169`	`+ return this + 1;`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`const pixel_type* next() const`
`174`	`173`	`{`
`175`		`- return (const pixel_type*)(c + pix_step);`
	`174`	`+ return this + 1;`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`pixel_type* advance(int n)`
`179`	`178`	`{`
`180`		`- return (pixel_type)(c + n pix_step);`
	`179`	`+ return this + n;`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`const pixel_type* advance(int n) const`
`184`	`183`	`{`
`185`		`- return (const pixel_type)(c + n pix_step);`
	`184`	`+ return this + n;`
`186`	`185`	`}`
`187`	`186`	`};`
`188`	`187`
Original file line number	Diff line number	Diff line change
`@@ -192,14 +192,13 @@ namespace agg`
`192`	`192`	`typedef typename color_type::calc_type calc_type;`
`193`	`193`	`enum`
`194`	`194`	`{`
`195`		`- num_components = 3,`
`196`	`195`	`pix_step = Step,`
`197`	`196`	`pix_offset = Offset,`
`198`	`197`	`pix_width = sizeof(value_type) * pix_step`
`199`	`198`	`};`
`200`	`199`	`struct pixel_type`
`201`	`200`	`{`
`202`		`- value_type c[num_components];`
	`201`	`+ value_type c[pix_step];`
`203`	`202`
`204`	`203`	`void set(value_type r, value_type g, value_type b)`
`205`	`204`	`{`
`@@ -230,22 +229,22 @@ namespace agg`
`230`	`229`
`231`	`230`	`pixel_type* next()`
`232`	`231`	`{`
`233`		`- return (pixel_type*)(c + pix_step);`
	`232`	`+ return this + 1;`
`234`	`233`	`}`
`235`	`234`
`236`	`235`	`const pixel_type* next() const`
`237`	`236`	`{`
`238`		`- return (const pixel_type*)(c + pix_step);`
	`237`	`+ return this + 1;`
`239`	`238`	`}`
`240`	`239`
`241`	`240`	`pixel_type* advance(int n)`
`242`	`241`	`{`
`243`		`- return (pixel_type)(c + n pix_step);`
	`242`	`+ return this + n;`
`244`	`243`	`}`
`245`	`244`
`246`	`245`	`const pixel_type* advance(int n) const`
`247`	`246`	`{`
`248`		`- return (const pixel_type)(c + n pix_step);`
	`247`	`+ return this + n;`
`249`	`248`	`}`
`250`	`249`	`};`
`251`	`250`
Original file line number	Diff line number	Diff line change
`@@ -1515,13 +1515,12 @@ namespace agg`
`1515`	`1515`	`typedef typename color_type::calc_type calc_type;`
`1516`	`1516`	`enum`
`1517`	`1517`	`{`
`1518`		`- num_components = 4,`
`1519`	`1518`	`pix_step = 4,`
`1520`	`1519`	`pix_width = sizeof(value_type) * pix_step,`
`1521`	`1520`	`};`
`1522`	`1521`	`struct pixel_type`
`1523`	`1522`	`{`
`1524`		`- value_type c[num_components];`
	`1523`	`+ value_type c[pix_step];`
`1525`	`1524`
`1526`	`1525`	`void set(value_type r, value_type g, value_type b, value_type a)`
`1527`	`1526`	`{`
`@@ -1555,22 +1554,22 @@ namespace agg`
`1555`	`1554`
`1556`	`1555`	`pixel_type* next()`
`1557`	`1556`	`{`
`1558`		`- return (pixel_type*)(c + pix_step);`
	`1557`	`+ return this + 1;`
`1559`	`1558`	`}`
`1560`	`1559`
`1561`	`1560`	`const pixel_type* next() const`
`1562`	`1561`	`{`
`1563`		`- return (const pixel_type*)(c + pix_step);`
	`1562`	`+ return this + 1;`
`1564`	`1563`	`}`
`1565`	`1564`
`1566`	`1565`	`pixel_type* advance(int n)`
`1567`	`1566`	`{`
`1568`		`- return (pixel_type)(c + n pix_step);`
	`1567`	`+ return this + n;`
`1569`	`1568`	`}`
`1570`	`1569`
`1571`	`1570`	`const pixel_type* advance(int n) const`
`1572`	`1571`	`{`
`1573`		`- return (const pixel_type)(c + n pix_step);`
	`1572`	`+ return this + n;`
`1574`	`1573`	`}`
`1575`	`1574`	`};`
`1576`	`1575`
`@@ -2193,13 +2192,12 @@ namespace agg`
`2193`	`2192`	`typedef typename color_type::calc_type calc_type;`
`2194`	`2193`	`enum`
`2195`	`2194`	`{`
`2196`		`- num_components = 4,`
`2197`	`2195`	`pix_step = 4,`
`2198`	`2196`	`pix_width = sizeof(value_type) * pix_step,`
`2199`	`2197`	`};`
`2200`	`2198`	`struct pixel_type`
`2201`	`2199`	`{`
`2202`		`- value_type c[num_components];`
	`2200`	`+ value_type c[pix_step];`
`2203`	`2201`
`2204`	`2202`	`void set(value_type r, value_type g, value_type b, value_type a)`
`2205`	`2203`	`{`
`@@ -2233,22 +2231,22 @@ namespace agg`
`2233`	`2231`
`2234`	`2232`	`pixel_type* next()`
`2235`	`2233`	`{`
`2236`		`- return (pixel_type*)(c + pix_step);`
	`2234`	`+ return this + 1;`
`2237`	`2235`	`}`
`2238`	`2236`
`2239`	`2237`	`const pixel_type* next() const`
`2240`	`2238`	`{`
`2241`		`- return (const pixel_type*)(c + pix_step);`
	`2239`	`+ return this + 1;`
`2242`	`2240`	`}`
`2243`	`2241`
`2244`	`2242`	`pixel_type* advance(int n)`
`2245`	`2243`	`{`
`2246`		`- return (pixel_type)(c + n pix_step);`
	`2244`	`+ return this + n;`
`2247`	`2245`	`}`
`2248`	`2246`
`2249`	`2247`	`const pixel_type* advance(int n) const`
`2250`	`2248`	`{`
`2251`		`- return (const pixel_type)(c + n pix_step);`
	`2249`	`+ return this + n;`
`2252`	`2250`	`}`
`2253`	`2251`	`};`
`2254`	`2252`