35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
--- ./regcomp.c.orig 2018-11-21 13:49:47.365690980 +0000
|
|
+++ ./regcomp.c 2018-11-21 13:51:40.257422076 +0000
|
|
@@ -12018,7 +12018,8 @@ S_grok_bslash_N(pTHX_ RExC_state_t *pREx
|
|
|
|
RExC_parse++; /* Skip past the '{' */
|
|
|
|
- if (! (endbrace = strchr(RExC_parse, '}'))) { /* no trailing brace */
|
|
+ endbrace = (char *) memchr(RExC_parse, '}', RExC_end - RExC_parse);
|
|
+ if (! endbrace) { /* no trailing brace */
|
|
vFAIL2("Missing right brace on \\%c{}", 'N');
|
|
}
|
|
else if(!(endbrace == RExC_parse /* nothing between the {} */
|
|
@@ -12687,9 +12688,11 @@ S_regatom(pTHX_ RExC_state_t *pRExC_stat
|
|
else {
|
|
STRLEN length;
|
|
char name = *RExC_parse;
|
|
- char * endbrace;
|
|
+ char * endbrace = NULL;
|
|
RExC_parse += 2;
|
|
- endbrace = strchr(RExC_parse, '}');
|
|
+ if (RExC_parse < RExC_end) {
|
|
+ endbrace = (char *) memchr(RExC_parse, '}', RExC_end - RExC_parse);
|
|
+ }
|
|
|
|
if (! endbrace) {
|
|
vFAIL2("Missing right brace on \\%c{}", name);
|
|
@@ -16218,7 +16221,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_sta
|
|
vFAIL2("Empty \\%c", (U8)value);
|
|
if (*RExC_parse == '{') {
|
|
const U8 c = (U8)value;
|
|
- e = strchr(RExC_parse, '}');
|
|
+ e = (char *) memchr(RExC_parse, '}', RExC_end - RExC_parse);
|
|
if (!e) {
|
|
RExC_parse++;
|
|
vFAIL2("Missing right brace on \\%c{}", c);
|