|
 |
243a19 |
From cb2fda94b02c5b7e8d16582410034f5a3dae526f Mon Sep 17 00:00:00 2001
|
|
|
243a19 |
From: Tony Cook <tony@develop-help.com>
|
|
|
243a19 |
Date: Tue, 25 Jul 2017 16:21:22 +1000
|
|
|
243a19 |
Subject: [PATCH] (perl #131588) be a little more careful in arybase::_tie_it()
|
|
|
243a19 |
MIME-Version: 1.0
|
|
|
243a19 |
Content-Type: text/plain; charset=UTF-8
|
|
|
243a19 |
Content-Transfer-Encoding: 8bit
|
|
|
243a19 |
|
|
|
243a19 |
Original patch by John Leitch <john@autosectools.com>
|
|
|
243a19 |
Petr Pisar: Ported to 5.26.0.
|
|
|
243a19 |
|
|
|
243a19 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
243a19 |
---
|
|
|
243a19 |
ext/arybase/arybase.xs | 10 ++++++----
|
|
|
243a19 |
ext/arybase/t/arybase.t | 4 +++-
|
|
|
243a19 |
2 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
243a19 |
|
|
|
243a19 |
diff --git a/ext/arybase/arybase.xs b/ext/arybase/arybase.xs
|
|
|
243a19 |
index 880bbe3..216442a 100644
|
|
|
243a19 |
--- a/ext/arybase/arybase.xs
|
|
|
243a19 |
+++ b/ext/arybase/arybase.xs
|
|
|
243a19 |
@@ -438,10 +438,12 @@ _tie_it(SV *sv)
|
|
|
243a19 |
INIT:
|
|
|
243a19 |
GV * const gv = (GV *)sv;
|
|
|
243a19 |
CODE:
|
|
|
243a19 |
- if (GvSV(gv))
|
|
|
243a19 |
- /* This is *our* scalar now! */
|
|
|
243a19 |
- sv_unmagic(GvSV(gv), PERL_MAGIC_sv);
|
|
|
243a19 |
- tie(aTHX_ GvSVn(gv), NULL, GvSTASH(CvGV(cv)));
|
|
|
243a19 |
+ if (isGV(gv)) {
|
|
|
243a19 |
+ if (GvSV(gv))
|
|
|
243a19 |
+ /* This is *our* scalar now! */
|
|
|
243a19 |
+ sv_unmagic(GvSV(gv), PERL_MAGIC_sv);
|
|
|
243a19 |
+ tie(aTHX_ GvSVn(gv), NULL, GvSTASH(CvGV(cv)));
|
|
|
243a19 |
+ }
|
|
|
243a19 |
|
|
|
243a19 |
void
|
|
|
243a19 |
FETCH(...)
|
|
|
243a19 |
diff --git a/ext/arybase/t/arybase.t b/ext/arybase/t/arybase.t
|
|
|
243a19 |
index f3d3287..41e90df 100644
|
|
|
243a19 |
--- a/ext/arybase/t/arybase.t
|
|
|
243a19 |
+++ b/ext/arybase/t/arybase.t
|
|
|
243a19 |
@@ -4,7 +4,7 @@
|
|
|
243a19 |
# plus miscellaneous bug fix tests
|
|
|
243a19 |
|
|
|
243a19 |
no warnings 'deprecated';
|
|
|
243a19 |
-use Test::More tests => 7;
|
|
|
243a19 |
+use Test::More tests => 8;
|
|
|
243a19 |
|
|
|
243a19 |
sub outside_base_scope { return "${'['}" }
|
|
|
243a19 |
|
|
|
243a19 |
@@ -34,4 +34,6 @@ is $@, "That use of \$[ is unsupported at $f line $l.\n",
|
|
|
243a19 |
|
|
|
243a19 |
sub foo { my $x; $x = wait } # compilation of this routine used to crash
|
|
|
243a19 |
|
|
|
243a19 |
+ok eval { arybase::_tie_it(1); 1 }, "don't crash on bad call to _tie_it()";
|
|
|
243a19 |
+
|
|
|
243a19 |
1;
|
|
|
243a19 |
--
|
|
|
243a19 |
2.9.4
|
|
|
243a19 |
|