Further potential pitfalls for the utf8 len/pos cache

found by Inaba Hiroto.  No test cases, yet.

p4raw-id: //depot/perl@18990

1 files changed, 23 insertions, 0 deletions

diff --git a/regcomp.c b/regcomp.c
index 2cd31ea173..c738714acf 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -495,6 +495,13 @@ S_scan_commit(pTHX_ RExC_state_t *pRExC_state, scan_data_t *data)
 	}
     }
     SvCUR_set(data->last_found, 0);
+    {
+	SV * sv = data->last_found;
+	MAGIC *mg =
+	    SvUTF8(sv) && SvMAGICAL(sv) ? mg_find(sv, PERL_MAGIC_utf8) : NULL;
+	if (mg && mg->mg_len > 0)
+	    mg->mg_len = 0;
+    }
     data->last_end = -1;
     data->flags &= ~SF_BEFORE_EOL;
 }
@@ -913,6 +920,14 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, I32 *deltap, reg
  			? I32_MAX : data->pos_min + data->pos_delta;
 		}
 		sv_catpvn(data->last_found, STRING(scan), STR_LEN(scan));
+		{
+		    SV * sv = data->last_found;
+		    MAGIC *mg = SvUTF8(sv) && SvMAGICAL(sv) ?
+			mg_find(sv, PERL_MAGIC_utf8) : NULL;
+		    if (mg && mg->mg_len >= 0)
+			mg->mg_len += utf8_length(STRING(scan),
+						  STRING(scan)+STR_LEN(scan));
+		}
 		if (UTF)
 		    SvUTF8_on(data->last_found);
 		data->last_end = data->pos_min + l;
@@ -1283,6 +1298,14 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, I32 *deltap, reg
 				SvCUR_set(data->last_found,
 					  SvCUR(data->last_found) - l);
 				sv_catsv(data->last_found, last_str);
+				{
+				    SV * sv = data->last_found;
+				    MAGIC *mg =
+					SvUTF8(sv) && SvMAGICAL(sv) ?
+					mg_find(sv, PERL_MAGIC_utf8) : NULL;
+				    if (mg && mg->mg_len >= 0)
+					mg->mg_len += CHR_SVLEN(last_str);
+				}
 				data->last_end += l * (mincount - 1);
 			    }
 			} else {