> -----Original Message----- > From: Gao, Liming > Sent: Monday, August 12, 2019 10:52 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J; Wu, Hao A > Subject: [Patch] MdeModulePkg/RegularExpressionDxe: Add two missing > null pointer checks > > 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 <jian.j.w...@intel.com> > Cc: Hao A Wu <hao.a...@intel.com> > Signed-off-by: Liming Gao <liming....@intel.com> > --- > 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, > > ext = onig_get_regex_ext(reg); > CHECK_NULL_RETURN_MEMERR(ext); > + CHECK_NULL_RETURN_MEMERR(ext->tag_table); > r = callout_tag_entry_raw(env, ext->tag_table, name, name_end, > entry_val); > > e = onig_reg_callout_list_at(reg, (int )entry_val); > @@ -3277,6 +3278,7 @@ node_new_str_raw_char(UChar c) > > p[0] = c; > node = node_new_str_raw(p, p + 1); > + CHECK_NULL_RETURN(node);
Reviewed-by: Hao A Wu <hao.a...@intel.com> Best Regards, Hao Wu > > /* clear buf tail */ > for (i = 1; i < NODE_STRING_BUF_SIZE; i++) > -- > 2.13.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#45391): https://edk2.groups.io/g/devel/message/45391 Mute This Topic: https://groups.io/mt/32836810/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
