From 9fdec3ff345557259f4c84f5b5b207c01e7e0e27 Mon Sep 17 00:00:00 2001 From: zxt Date: Tue, 24 May 2022 08:55:44 +0800 Subject: [PATCH] Description: Vulnerability Remediation IssueNo: https://gitee.com/openharmony/third_party_freetype/issues/I56E40 Feature or Bugfix: Bugfix Binary Source:No Signed-off-by: zxt --- src/base/ftobjs.c | 3 +++ src/sfnt/sfobjs.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index e301f8f..3cb1d8e 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -3244,6 +3244,9 @@ if ( !face ) return FT_THROW( Invalid_Face_Handle ); + if ( !face->size ) + return FT_THROW( Invalid_Size_Handle ); + if ( !req || req->width < 0 || req->height < 0 || req->type >= FT_SIZE_REQUEST_TYPE_MAX ) return FT_THROW( Invalid_Argument ); diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 6edf3ae..ab01282 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -528,7 +528,7 @@ face_index = FT_ABS( face_instance_index ) & 0xFFFF; /* value -(N+1) requests information on index N */ - if ( face_instance_index < 0 ) + if ( face_instance_index < 0 && face_index > 0) face_index--; if ( face_index >= face->ttc_header.count ) -- GitLab