]> git.proxmox.com Git - mirror_edk2.git/commitdiff
MdeModulePkg/RegularExpressionDxe: Miss null pointer check
authorDongao Guo <dongao.guo@intel.com>
Thu, 11 Oct 2018 06:57:00 +0000 (14:57 +0800)
committerLiming Gao <liming.gao@intel.com>
Mon, 15 Oct 2018 07:55:51 +0000 (15:55 +0800)
Oniguruma https://github.com/kkos/oniguruma
this change is merged from oniguruma develop branch.
from commit 396a757dffafc0c7eb269433c29a0ba961d73ad6.

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>
MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c

index d274873aae3e9f7b9358009c3f2ffc92619b330d..6033d2166b9154a0f29cf3dd8a3f5c0ebf58801b 100644 (file)
@@ -7725,8 +7725,9 @@ parse_exp(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
   case TK_ALT:\r
   case TK_EOT:\r
   end_of_token:\r
-  *np = node_new_empty();\r
-  return tok->type;\r
+    *np = node_new_empty();\r
+    CHECK_NULL_RETURN_MEMERR(*np);\r
+    return tok->type;\r
   break;\r
 \r
   case TK_SUBEXP_OPEN:\r
@@ -7977,8 +7978,10 @@ parse_exp(Node** np, OnigToken* tok, int term, UChar** src, UChar* end,
     if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS)) {\r
       if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS))\r
         return ONIGERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED;\r
-      else\r
+      else {\r
         *np = node_new_empty();\r
+        CHECK_NULL_RETURN_MEMERR(*np);\r
+      }\r
     }\r
     else {\r
       goto tk_byte;\r