Commit 1c0862938d798a1e79a3a087d4a93ff8628c13d2
2021-04-02T06:55:29
[sfnt] Check validity of pointer location of `read_color_line`. * src/sfnt/ttcolr.c (get_child_table_pointer): New function to fetch child table pointer early for all paint formats that compute a child table pointer. (read_color_line, read_paint): Updated. (tt_face_get_colorline_stops): Check `colr->table`.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378
diff --git a/ChangeLog b/ChangeLog
index ed2d094..ec0d132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2021-03-30 Dominik Röttsches <drott@chromium.org>
+
+ [sfnt] Check validity of pointer location of `read_color_line`.
+
+ * src/sfnt/ttcolr.c (get_child_table_pointer): New function to fetch
+ child table pointer early for all paint formats that compute a child
+ table pointer.
+ (read_color_line, read_paint): Updated.
+ (tt_face_get_colorline_stops): Check `colr->table`.
+
2021-03-28 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>
[docs] Update docwriter stylesheet for 1.3.1.
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 1430cfc..2f1ae52 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -320,13 +320,11 @@
static FT_Bool
- read_color_line( FT_Byte* paint_base,
- FT_ULong colorline_offset,
+ read_color_line( FT_Byte* color_line_p,
FT_ColorLine *colorline )
{
- FT_Byte* p = (FT_Byte *)( paint_base + colorline_offset );
+ FT_Byte* p = color_line_p;
FT_PaintExtend paint_extend;
- /* TODO: Check pointer limits. */
paint_extend = FT_NEXT_BYTE( p );
@@ -343,14 +341,53 @@
}
+ /*
+ * Read a paint offset for `FT_Paint*` objects that have them and check
+ * whether it is within reasonable limits within the font and the COLR
+ * table.
+ *
+ * Return 1 on success, 0 on failure.
+ */
+ static FT_Bool
+ get_child_table_pointer ( Colr* colr,
+ FT_Byte* paint_base,
+ FT_Byte** p,
+ FT_Byte** child_table_pointer )
+ {
+ FT_UInt32 paint_offset;
+ FT_Byte* child_table_p;
+
+
+ if ( !child_table_pointer )
+ return 0;
+
+ paint_offset = FT_NEXT_UOFF3( *p );
+ if ( !paint_offset )
+ return 0;
+
+ child_table_p = (FT_Byte*)( paint_base + paint_offset );
+
+ if ( child_table_p < colr->base_glyphs_v1 ||
+ child_table_p >= ( (FT_Byte*)colr->table + colr->table_size ) )
+ return 0;
+
+ *child_table_pointer = child_table_p;
+ return 1;
+ }
+
+
static FT_Bool
read_paint( Colr* colr,
FT_Byte* p,
FT_COLR_Paint* apaint )
{
- FT_Byte* paint_base = p;
+ FT_Byte* paint_base = p;
+ FT_Byte* child_table_p = NULL;
+ if ( !p || !colr || !colr->table )
+ return 0;
+
apaint->format = FT_NEXT_BYTE( p );
if ( apaint->format >= FT_COLR_PAINT_FORMAT_MAX )
@@ -382,38 +419,34 @@
return 1;
}
- if ( apaint->format == FT_COLR_PAINTFORMAT_GLYPH )
- {
- FT_UInt32 paint_offset;
- FT_Byte* paint_p;
-
-
- paint_offset = FT_NEXT_UOFF3( p );
- if ( !paint_offset )
- return 0;
-
- paint_p = (FT_Byte*)( paint_base + paint_offset );
- if ( paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
-
- apaint->u.glyph.paint.p = paint_p;
- apaint->u.glyph.paint.insert_root_transform = 0;
- apaint->u.glyph.glyphID = FT_NEXT_USHORT( p );
- }
-
else if ( apaint->format == FT_COLR_PAINTFORMAT_SOLID )
{
apaint->u.solid.color.palette_index = FT_NEXT_USHORT ( p );
apaint->u.solid.color.alpha = FT_NEXT_USHORT ( p );
+
+ return 1;
}
- else if ( apaint->format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT )
+ else if ( apaint->format == FT_COLR_PAINTFORMAT_COLR_GLYPH )
{
- FT_ULong color_line_offset = FT_NEXT_OFF3( p );
+ apaint->u.colr_glyph.glyphID = FT_NEXT_USHORT( p );
+
+ return 1;
+ }
+
+ /*
+ * Grouped below here are all paint formats that have an offset to a
+ * child paint table as the first entry (for example, a color line or a
+ * child paint table). Retrieve that and determine whether that paint
+ * offset is valid first.
+ */
+ if ( !get_child_table_pointer( colr, paint_base, &p, &child_table_p ) )
+ return 0;
- if ( !read_color_line( paint_base,
- color_line_offset,
+ if ( apaint->format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT )
+ {
+ if ( !read_color_line( child_table_p,
&apaint->u.linear_gradient.colorline ) )
return 0;
@@ -423,15 +456,13 @@
apaint->u.linear_gradient.p1.y = FT_NEXT_SHORT ( p );
apaint->u.linear_gradient.p2.x = FT_NEXT_SHORT ( p );
apaint->u.linear_gradient.p2.y = FT_NEXT_SHORT ( p );
+
+ return 1;
}
else if ( apaint->format == FT_COLR_PAINTFORMAT_RADIAL_GRADIENT )
{
- FT_ULong color_line_offset = color_line_offset = FT_NEXT_OFF3( p );
-
-
- if ( !read_color_line( paint_base,
- color_line_offset,
+ if ( !read_color_line( child_table_p,
&apaint->u.radial_gradient.colorline ) )
return 0;
@@ -444,15 +475,13 @@
apaint->u.radial_gradient.c1.y = FT_NEXT_SHORT ( p );
apaint->u.radial_gradient.r1 = FT_NEXT_USHORT ( p );
+
+ return 1;
}
else if ( apaint->format == FT_COLR_PAINTFORMAT_SWEEP_GRADIENT )
{
- FT_ULong color_line_offset = color_line_offset = FT_NEXT_OFF3( p );
-
-
- if ( !read_color_line( paint_base,
- color_line_offset,
+ if ( !read_color_line( child_table_p,
&apaint->u.sweep_gradient.colorline ) )
return 0;
@@ -461,23 +490,22 @@
apaint->u.sweep_gradient.start_angle = FT_NEXT_LONG( p );
apaint->u.sweep_gradient.end_angle = FT_NEXT_LONG( p );
+
+ return 1;
}
- else if ( apaint->format == FT_COLR_PAINTFORMAT_TRANSFORMED )
+ if ( apaint->format == FT_COLR_PAINTFORMAT_GLYPH )
{
- FT_UInt32 paint_offset;
- FT_Byte* paint_p;
-
-
- paint_offset = FT_NEXT_UOFF3( p );
- if ( !paint_offset )
- return 0;
+ apaint->u.glyph.paint.p = child_table_p;
+ apaint->u.glyph.paint.insert_root_transform = 0;
+ apaint->u.glyph.glyphID = FT_NEXT_USHORT( p );
- paint_p = (FT_Byte*)( paint_base + paint_offset );
- if ( paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
+ return 1;
+ }
- apaint->u.transformed.paint.p = paint_p;
+ else if ( apaint->format == FT_COLR_PAINTFORMAT_TRANSFORMED )
+ {
+ apaint->u.transformed.paint.p = child_table_p;
apaint->u.transformed.paint.insert_root_transform = 0;
apaint->u.transformed.affine.xx = FT_NEXT_LONG( p );
@@ -486,67 +514,37 @@
apaint->u.transformed.affine.yy = FT_NEXT_LONG( p );
apaint->u.transformed.affine.dx = FT_NEXT_LONG( p );
apaint->u.transformed.affine.dy = FT_NEXT_LONG( p );
+
+ return 1;
}
else if ( apaint->format == FT_COLR_PAINTFORMAT_TRANSLATE )
{
- FT_UInt32 paint_offset;
- FT_Byte* paint_p;
-
-
- paint_offset = FT_NEXT_UOFF3( p );
- if ( !paint_offset )
- return 0;
-
- paint_p = (FT_Byte*)( paint_base + paint_offset );
- if ( paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
-
- apaint->u.translate.paint.p = paint_p;
+ apaint->u.translate.paint.p = child_table_p;
apaint->u.translate.paint.insert_root_transform = 0;
apaint->u.translate.dx = FT_NEXT_LONG( p );
apaint->u.translate.dy = FT_NEXT_LONG( p );
+
+ return 1;
}
else if ( apaint->format == FT_COLR_PAINTFORMAT_ROTATE )
{
- FT_UInt32 paint_offset;
- FT_Byte* paint_p;
-
-
- paint_offset = FT_NEXT_UOFF3( p );
- if ( !paint_offset )
- return 0;
-
- paint_p = (FT_Byte*)( paint_base + paint_offset );
- if ( paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
-
- apaint->u.rotate.paint.p = paint_p;
+ apaint->u.rotate.paint.p = child_table_p;
apaint->u.rotate.paint.insert_root_transform = 0;
apaint->u.rotate.angle = FT_NEXT_LONG( p );
apaint->u.rotate.center_x = FT_NEXT_LONG( p );
apaint->u.rotate.center_y = FT_NEXT_LONG( p );
+
+ return 1;
}
else if ( apaint->format == FT_COLR_PAINTFORMAT_SKEW )
{
- FT_UInt32 paint_offset;
- FT_Byte* paint_p;
-
-
- paint_offset = FT_NEXT_UOFF3( p );
- if ( !paint_offset )
- return 0;
-
- paint_p = (FT_Byte*)( paint_base + paint_offset );
- if ( paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
-
- apaint->u.skew.paint.p = paint_p;
+ apaint->u.skew.paint.p = child_table_p;
apaint->u.skew.paint.insert_root_transform = 0;
apaint->u.skew.x_skew_angle = FT_NEXT_LONG( p );
@@ -554,31 +552,17 @@
apaint->u.skew.center_x = FT_NEXT_LONG( p );
apaint->u.skew.center_y = FT_NEXT_LONG( p );
+
+ return 1;
}
else if ( apaint->format == FT_COLR_PAINTFORMAT_COMPOSITE )
{
- FT_UInt32 source_paint_offset;
- FT_Byte* source_paint_p;
-
- FT_UInt32 backdrop_paint_offset;
- FT_Byte* backdrop_paint_p;
+ FT_UInt composite_mode;
- FT_UInt composite_mode;
-
- source_paint_offset = FT_NEXT_UOFF3( p );
- if ( !source_paint_offset )
- return 0;
-
- source_paint_p = (FT_Byte*)( paint_base + source_paint_offset );
- if ( source_paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
-
- apaint->u.composite.source_paint.p =
- source_paint_p;
- apaint->u.composite.source_paint.insert_root_transform =
- 0;
+ apaint->u.composite.source_paint.p = child_table_p;
+ apaint->u.composite.source_paint.insert_root_transform = 0;
composite_mode = FT_NEXT_BYTE( p );
if ( composite_mode >= FT_COLR_COMPOSITE_MAX )
@@ -586,24 +570,18 @@
apaint->u.composite.composite_mode = composite_mode;
- backdrop_paint_offset = FT_NEXT_UOFF3( p );
- if ( !backdrop_paint_offset )
- return 0;
-
- backdrop_paint_p = (FT_Byte*)( paint_base + backdrop_paint_offset );
- if ( backdrop_paint_p > ( (FT_Byte*)colr->table + colr->table_size ) )
- return 0;
+ if ( !get_child_table_pointer( colr, paint_base, &p, &child_table_p ) )
+ return 0;
apaint->u.composite.backdrop_paint.p =
- backdrop_paint_p;
+ child_table_p;
apaint->u.composite.backdrop_paint.insert_root_transform =
0;
- }
- else if ( apaint->format == FT_COLR_PAINTFORMAT_COLR_GLYPH )
- apaint->u.colr_glyph.glyphID = FT_NEXT_USHORT( p );
+ return 1;
+ }
- return 1;
+ return 0;
}
@@ -759,7 +737,7 @@
FT_Byte* p;
- if ( !colr )
+ if ( !colr || !colr->table )
return 0;
if ( iterator->current_color_stop >= iterator->num_color_stops )