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.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
index 4605d40bd12df6c786cdff78d6737f241b7c68a2..2b121690e1f7ff203018bd0eb54fef6d2c9f98b9 100644 (file)
--- 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,
 \r
   ext = onig_get_regex_ext(reg);\r
   CHECK_NULL_RETURN_MEMERR(ext);\r
+  CHECK_NULL_RETURN_MEMERR(ext->tag_table);\r
   r = callout_tag_entry_raw(env, ext->tag_table, name, name_end, entry_val);\r
 \r
   e = onig_reg_callout_list_at(reg, (int )entry_val);\r
@@ -3277,6 +3278,7 @@ node_new_str_raw_char(UChar c)
 \r
   p[0] = c;\r
   node = node_new_str_raw(p, p + 1);\r
+  CHECK_NULL_RETURN(node);\r
 \r
   /* clear buf tail */\r
   for (i = 1; i < NODE_STRING_BUF_SIZE; i++)\r