!7 【版本号：1.1.3】【3516】组件freetype 2.10.2存在1个未修复漏洞

Merge pull request !7 from 高荣鑫/OpenHarmony_1.0.1_release

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;
 
@@ -336,12 +343,6 @@
       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 */