commit 552187569cb2196d582c44f58e1207c771da1821
author android-build-team Robot <android-build-team-robot@google.com> Thu Nov 12 00:07:12 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 12 00:07:12 2020 +0000
tree 8274228d6bc2dd68afbe3e366fd27a6efb3a8313
parent ddafed93bb34b6be1b02089d1427984e9e10f532
parent 6f4fe149c0e553b612e71b8fedb197c3316c05dc

Snap for 6966897 from 6f4fe149c0e553b612e71b8fedb197c3316c05dc to rvc-qpr2-release

Change-Id: I1b1fbf1d253e05e438dbeb7735e144479f9862b9

src/sfnt/pngshim.c

diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index ca85d97..15f4e16 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 */