github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick b977dff8 from freetype (#26068)

Browse Source 
Co-authored-by: Andrey Belenko <anbelen@microsoft.com>
This commit is contained in:
Andrey Belenko
2020-10-23 03:28:34 +02:00
committed by GitHub
parent ce178d4b9d
commit b431f02373
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/config.json
View File

@@ -19,5 +19,7 @@
"src/electron/patches/skia": "src/third_party/skia",
"src/electron/patches/ffmpeg": "src/third_party/ffmpeg"
"src/electron/patches/ffmpeg": "src/third_party/ffmpeg",
"src/electron/patches/freetype": "src/third_party/freetype/src"
}

1
patches/freetype/.patches Normal file
View File

@@ -0,0 +1 @@
test_early_to_prevent_overflow.patch

39
patches/freetype/test_early_to_prevent_overflow.patch Normal file
View File

@@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Andrey Belenko <anbelen@microsoft.com>
Date: Tue, 20 Oct 2020 21:24:11 +0200
Subject: Test early to prevent overflow.
Bug: chromium:1139963
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index 5f80ac2df1fe9e4e9b17383e6eb6c85a5368787e..72bac72a9afb970e7ddf022102384404a22429ba 100644
--- a/src/sfnt/pngshim.c
+++ b/src/sfnt/pngshim.c
@@ -328,6 +328,13 @@
if ( populate_map_and_metrics )
{
+ /* reject too large bitmaps similarly to the rasterizer */
+ if ( imgWidth > 0x7FFF || imgHeight > 0x7FFF )
+ {
+ error = FT_THROW( Array_Too_Large );
+ goto DestroyExit;
+ }
+
metrics->width = (FT_UShort)imgWidth;
metrics->height = (FT_UShort)imgHeight;
@@ -336,13 +343,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 */