MdeModulePkg/RegularExpressionDxe: Miss null pointer check

Oniguruma https://github.com/kkos/oniguruma
this change is merged from oniguruma develop branch.
from commit 1db8a2726dfad0401f928cb8474bd770f07040a7.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dongao Guo <dongao.guo@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
index 5b7fec99e2e374f7142c01c40e573af1e46778e4..c71ae5fa700c55fbe6c60fac0e145c6549ecd329 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
@@ -1906,6 +1906,7 @@ callout_tag_entry(regex_t* reg, UChar* name, UChar* name_end,
   if (r != ONIG_NORMAL) return r;\r
 \r
   ext = onig_get_regex_ext(reg);\r
+  CHECK_NULL_RETURN_MEMERR(ext);\r
   r = callout_tag_entry_raw(ext->tag_table, name, name_end, entry_val);\r
 \r
   e = onig_reg_callout_list_at(reg, (int )entry_val);\r
@@ -2088,6 +2089,7 @@ node_new(void)
   Node* node;\r
 \r
   node = (Node* )xmalloc(sizeof(Node));\r
+  CHECK_NULL_RETURN(node);\r
   xmemset(node, 0, sizeof(*node));\r
 \r
 #ifdef DEBUG_NODE_FREE\r
@@ -6616,6 +6618,7 @@ parse_callout_of_contents(Node** np, int cterm, UChar** src, UChar* end, ScanEnv
   if (r != 0) return r;\r
 \r
   ext = onig_get_regex_ext(env->reg);\r
+  CHECK_NULL_RETURN_MEMERR(ext);\r
   if (IS_NULL(ext->pattern)) {\r
     r = onig_ext_set_pattern(env->reg, env->pattern, env->pattern_end);\r
     if (r != ONIG_NORMAL) return r;\r
@@ -6936,6 +6939,7 @@ parse_callout_of_name(Node** np, int cterm, UChar** src, UChar* end, ScanEnv* en
   if (r != 0) return r;\r
 \r
   ext = onig_get_regex_ext(env->reg);\r
+  CHECK_NULL_RETURN_MEMERR(ext);\r
   if (IS_NULL(ext->pattern)) {\r
     r = onig_ext_set_pattern(env->reg, env->pattern, env->pattern_end);\r
     if (r != ONIG_NORMAL) return r;\r
@@ -7987,6 +7991,7 @@ parse_exp(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
       int ascii_mode =\r
         IS_WORD_ASCII(env->options) && IS_WORD_ANCHOR_TYPE(tok->u.anchor) ? 1 : 0;\r
       *np = onig_node_new_anchor(tok->u.anchor, ascii_mode);\r
+         CHECK_NULL_RETURN_MEMERR(*np);\r
     }\r
     break;\r
 \r