Merge pull request #733 from tabudz/fix-cve-2020-26159

SergeySlice · web-flow · commit cf4dfac4ba3d · 2025-04-01T19:36:48.000+03:00
Fix: Potential Vulnerability in Cloned Function
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regcomp.c
@@ -5222,7 +5222,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc)
 
   for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) {
     len = enclen(enc, p);
-    if (i + len > OPT_EXACT_MAXLEN) break;
+    if (i + len >= OPT_EXACT_MAXLEN) break;
     for (j = 0; j < len && p < end; j++)
       to->s[i++] = *p++;
   }

Original file line number	Diff line number	Diff line change
`@@ -5222,7 +5222,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc)`
`5222`	`5222`
`5223`	`5223`	`for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) {`
`5224`	`5224`	`len = enclen(enc, p);`
`5225`		`- if (i + len > OPT_EXACT_MAXLEN) break;`
	`5225`	`+ if (i + len >= OPT_EXACT_MAXLEN) break;`
`5226`	`5226`	`for (j = 0; j < len && p < end; j++)`
`5227`	`5227`	`to->s[i++] = *p++;`
`5228`	`5228`	`}`