diff options
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -2256,7 +2256,8 @@ Perl_regexec_flags(pTHX_ REGEXP * const rx, char *stringarg, char *strend, (flags & REXEC_IGNOREPOS) ? stringarg /* use start pos rather than pos() */ : (sv && (mg = mg_find_mglob(sv)) && mg->mg_len >= 0) - ? strbeg + mg->mg_len /* Defined pos() */ + /* Defined pos(): */ + ? strbeg + MgBYTEPOS(mg, sv, strbeg, strend-strbeg) : strbeg; /* pos() not defined; use start of string */ DEBUG_GPOS_r(PerlIO_printf(Perl_debug_log, @@ -5027,8 +5028,9 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) rex->offs[0].end = locinput - reginfo->strbeg; if (reginfo->info_aux_eval->pos_magic) - reginfo->info_aux_eval->pos_magic->mg_len - = locinput - reginfo->strbeg; + MgBYTEPOS_set(reginfo->info_aux_eval->pos_magic, + reginfo->sv, reginfo->strbeg, + locinput - reginfo->strbeg); if (sv_yes_mark) { SV *sv_mrk = get_sv("REGMARK", 1); @@ -7648,6 +7650,7 @@ S_setup_eval_state(pTHX_ regmatch_info *const reginfo) } eval_state->pos_magic = mg; eval_state->pos = mg->mg_len; + eval_state->pos_flags = mg->mg_flags; } else eval_state->pos_magic = NULL; @@ -7722,7 +7725,12 @@ S_cleanup_regmatch_info_aux(pTHX_ void *arg) RXp_MATCH_COPIED_on(rex); } if (eval_state->pos_magic) + { eval_state->pos_magic->mg_len = eval_state->pos; + eval_state->pos_magic->mg_flags = + (eval_state->pos_magic->mg_flags & ~MGf_BYTES) + | (eval_state->pos_flags & MGf_BYTES); + } PL_curpm = eval_state->curpm; } |