summaryrefslogtreecommitdiff
path: root/pp_hot.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2000-10-21 00:44:18 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2000-10-21 00:44:18 +0000
commit689440ec6112b0ad8e13a518cfe8f7c6b95df346 (patch)
tree61c7d30e17f0a7ee54ca103fc5951a58f1585af0 /pp_hot.c
parentb73d6f5067e468c85b81d9c800ab577f770b45b3 (diff)
downloadperl-689440ec6112b0ad8e13a518cfe8f7c6b95df346.tar.gz
Fix for ID 20001020.006, concatenating an unset submatch
with utf8 resulted in "Modification of a read-only value". p4raw-id: //depot/perl@7383
Diffstat (limited to 'pp_hot.c')
-rw-r--r--pp_hot.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/pp_hot.c b/pp_hot.c
index 9b0573bb03..d6a7f04da2 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -172,8 +172,14 @@ PP(pp_concat)
/* Take a copy since we're about to overwrite TARG */
olds = s = (U8*)savepvn((char*)s, len);
}
- if (!SvOK(left) && SvTYPE(left) <= SVt_PVMG)
- sv_setpv(left, ""); /* Suppress warning. */
+ if (!SvOK(left) && SvTYPE(left) <= SVt_PVMG) {
+ if (SvREADONLY(left)) {
+ left = sv_2mortal(newSVpvn("", 0));
+ left_utf = FALSE;
+ }
+ else
+ sv_setpv(left, ""); /* Suppress warning. */
+ }
l = (U8*)SvPV(left, targlen);
left_utf |= DO_UTF8(left);
if (TARG != left)