commit 008cd12f4e42d58b02499958a3484b3ece962f1f
author Seigo Nonaka <nona@google.com> Wed Oct 21 19:22:22 2020 -0700
committer Seigo Nonaka <nona@google.com> Thu Oct 22 19:34:16 2020 +0000
tree 9832a06ada27427eb07c4af0e4bce526748230e0
parent e80176817362084a8ca462ae981bffafa71bfe0f

Cherry-pick one upstream patch

The original commit in upstream patch is
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=a3bab162b2ae616074c8877a04556932998aeacd

Bug: 171232105
Test: m -j
Change-Id: Ib9e82430d1c8a232dc7d86848c807948a35ee55e

src/sfnt/pngshim.c

diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index 0674bda..ba9e5ff 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 */