MdeModulePkg: Add NULL pointer check for RegularExpressionDxe.

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / regexec.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
index 160c995fa4e77f3ccf2d905ad17bd566fdbbadfb..a175f3a6cc499c100d7cf44a32d15ea4e2298d26 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
@@ -243,7 +243,9 @@ onig_region_new(void)
   OnigRegion* r;\r
 \r
   r = (OnigRegion* )xmalloc(sizeof(OnigRegion));\r
-  onig_region_init(r);\r
+  if (r != NULL) {\r
+    onig_region_init(r);\r
+  }\r
   return r;\r
 }\r
 \r
@@ -284,6 +286,10 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
     to->allocated = from->num_regs;\r
   }\r
 \r
+  if (to->beg == NULL || to->end == NULL) {\r
+    return;\r
+  }\r
+\r
   for (i = 0; i < from->num_regs; i++) {\r
     to->beg[i] = from->beg[i];\r
     to->end[i] = from->end[i];\r