summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--av.c8
-rw-r--r--t/op/list.t6
2 files changed, 12 insertions, 2 deletions
diff --git a/av.c b/av.c
index 4718af28c8..a4d6ea2d06 100644
--- a/av.c
+++ b/av.c
@@ -404,8 +404,14 @@ Perl_av_make(pTHX_ register I32 size, register SV **strp)
AvFILLp(av) = AvMAX(av) = size - 1;
for (i = 0; i < size; i++) {
assert (*strp);
+
+ /* Don't let sv_setsv swipe, since our source array might
+ have multiple references to the same temp scalar (e.g.
+ from a list slice) */
+
ary[i] = newSV(0);
- sv_setsv(ary[i], *strp);
+ sv_setsv_flags(ary[i], *strp,
+ SV_GMAGIC|SV_DO_COW_SVSETSV|SV_NOSTEAL);
strp++;
}
}
diff --git a/t/op/list.t b/t/op/list.t
index a8fdc180b5..184724a3cf 100644
--- a/t/op/list.t
+++ b/t/op/list.t
@@ -6,7 +6,7 @@ BEGIN {
}
require "test.pl";
-plan( tests => 57 );
+plan( tests => 58 );
@foo = (1, 2, 3, 4);
cmp_ok($foo[0], '==', 1, 'first elem');
@@ -161,3 +161,7 @@ cmp_ok(join('',(1,2),3,(4,5)),'eq','12345','list (..).(..)');
test_zero_args("do-returned list slice", do { (10,11)[2,3]; });
}
+{
+ # perl #20321
+ is (join('', @{[('abc'=~/./g)[0,1,2,1,0]]}), "abcba");
+}