From nobody Tue Apr 16 23:40:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+45349+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45349+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1565578351; cv=none; d=zoho.com; s=zohoarc; b=bPOxwmrFFusPUZSqLncaon+mxxLkMxHOLe8rmTQDYJG68fWzBOVVzFQMTPD2eVQe+w4lUND9uH7OD39oCed9qtN+0clo4ho/wikWDTPB7+Oyd1xZ5kLZQaZIryLDLHHelfXVLEgw3RxEVjswEvF6/gcdmHeoyYzUJNp2nIN5/JA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565578351; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=tT/OLGCezTigyA45p+oi/qcLJ7WPZlhS9QDSH/NXq24=; b=ImQEDVvtzWohbYidq+IZiVYzsRVsILfnGMIg7+Bh+Xgu/26GFzfci3vwUuWhQUiepiH0B3755kbCoEFcFkPTmzqo6QIeqimtSPh9T7Y/zFNL9Pp3RaWLVj83WezdQKLsyIKWVz0Q25ZhvTT4mlY8ODCwb9EzOViUwnV55u5vcmw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45349+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1565578351637219.00280338234074; Sun, 11 Aug 2019 19:52:31 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Sun, 11 Aug 2019 19:52:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Aug 2019 19:52:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,375,1559545200"; d="scan'208";a="177354693" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga007.fm.intel.com with ESMTP; 11 Aug 2019 19:52:28 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu Subject: [edk2-devel] [Patch] MdeModulePkg/RegularExpressionDxe: Add two missing null pointer checks Date: Mon, 12 Aug 2019 10:52:18 +0800 Message-Id: <1565578338-10404-1-git-send-email-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1565578351; bh=GNrzytFtPGP5jqg5rDuiHurKWvH381x5TOv5zCuC7lI=; h=Cc:Date:From:Reply-To:Subject:To; b=joawyZtQelz+LDMxvPUlomJRG6HTrGB5tB3DgWdDxJuewuSOCGqIkWes6GrV3WQHQpR wpo1anSQIE19FH6AL5yzG4yN3z7MWg47qrbOjp7sosQ7DZpz+RFPBh8FGD7PcPzYv7Czq 0bSSjr0FYE4+5YyR0VwfIWB2vuSE6FjYSGM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" After update Oniguruma from v6.9.0 to v6.9.3, two null pointer check should be added. This change bases on the patch https://edk2.groups.io/g/devel/message/45183. Cc: Jian J Wang Cc: Hao A Wu Signed-off-by: Liming Gao Reviewed-by: Hao A Wu --- MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse= .c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c index 4605d40bd1..2b121690e1 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c +++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c @@ -1955,6 +1955,7 @@ callout_tag_entry(ScanEnv* env, regex_t* reg, UChar* = name, UChar* name_end, =20 ext =3D onig_get_regex_ext(reg); CHECK_NULL_RETURN_MEMERR(ext); + CHECK_NULL_RETURN_MEMERR(ext->tag_table); r =3D callout_tag_entry_raw(env, ext->tag_table, name, name_end, entry_v= al); =20 e =3D onig_reg_callout_list_at(reg, (int )entry_val); @@ -3277,6 +3278,7 @@ node_new_str_raw_char(UChar c) =20 p[0] =3D c; node =3D node_new_str_raw(p, p + 1); + CHECK_NULL_RETURN(node); =20 /* clear buf tail */ for (i =3D 1; i < NODE_STRING_BUF_SIZE; i++) --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#45349): https://edk2.groups.io/g/devel/message/45349 Mute This Topic: https://groups.io/mt/32836810/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-