Merge pull request CloverHackyColor#732 from tabudz/fix-CVE-2019-19204

SergeySlice · web-flow · commit 03b467a5d07d · 2025-04-01T19:37:14.000+03:00
Fix: Potential Vulnerability in Cloned Function
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
@@ -4200,7 +4200,7 @@ fetch_interval_quantifier(UChar** src, UChar* end, PToken* tok, ScanEnv* env)
   if (PEND) goto invalid;
   PFETCH(c);
   if (IS_SYNTAX_OP(env->syntax, ONIG_SYN_OP_ESC_BRACE_INTERVAL)) {
-    if (c != MC_ESC(env->syntax)) goto invalid;
+    if (c != MC_ESC(env->syntax) || PEND) goto invalid;
     PFETCH(c);
   }
   if (c != '}') goto invalid;

Original file line number	Diff line number	Diff line change
`@@ -4200,7 +4200,7 @@ fetch_interval_quantifier(UChar** src, UChar* end, PToken* tok, ScanEnv* env)`
`4200`	`4200`	`if (PEND) goto invalid;`
`4201`	`4201`	`PFETCH(c);`
`4202`	`4202`	`if (IS_SYNTAX_OP(env->syntax, ONIG_SYN_OP_ESC_BRACE_INTERVAL)) {`
`4203`		`- if (c != MC_ESC(env->syntax)) goto invalid;`
	`4203`	`+ if (c != MC_ESC(env->syntax) \|\| PEND) goto invalid;`
`4204`	`4204`	`PFETCH(c);`
`4205`	`4205`	`}`
`4206`	`4206`	`if (c != '}') goto invalid;`