diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:45:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-13 23:45:36 +0000 |
| commit | 2efbd33d55ea8241d99ff09bdca1e6c149db6e55 (patch) | |
| tree | 8274228d6bc2dd68afbe3e366fd27a6efb3a8313 | |
| parent | bf3855d2c4cd8fe9ff0cd77524559e15ed00401e (diff) | |
| parent | 7b9e3fba169d844769727bac6c0064bef6ed6ead (diff) | |
| download | freetype-android-mainline-11.0.0_r21.tar.gz | |
Snap for 7080740 from 7b9e3fba169d844769727bac6c0064bef6ed6ead to mainline-resolv-releaseandroid-mainline-11.0.0_r21
Change-Id: I15ea77eca73ba4c28d17f5af7173fc07d206c01b
| -rw-r--r-- | src/sfnt/pngshim.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c index ca85d9751..15f4e1631 100644 --- a/src/sfnt/pngshim.c +++ b/src/sfnt/pngshim.c @@ -327,6 +327,13 @@ if ( populate_map_and_metrics ) { + /* reject too large bitmaps similarly to the rasterizer */ + if ( imgHeight > 0x7FFF || imgWidth > 0x7FFF ) + { + error = FT_THROW( Array_Too_Large ); + goto DestroyExit; + } + metrics->width = (FT_UShort)imgWidth; metrics->height = (FT_UShort)imgHeight; @@ -335,13 +342,6 @@ map->pixel_mode = FT_PIXEL_MODE_BGRA; map->pitch = (int)( map->width * 4 ); map->num_grays = 256; - - /* reject too large bitmaps similarly to the rasterizer */ - if ( map->rows > 0x7FFF || map->width > 0x7FFF ) - { - error = FT_THROW( Array_Too_Large ); - goto DestroyExit; - } } /* convert palette/gray image to rgb */ |