In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/a454544894f400fa38f59e5d8a762355e4b0ac42?hp=efc7e14980b5dc9088e91f40b8b0098d78d6ed86>

- Log -----------------------------------------------------------------
commit a454544894f400fa38f59e5d8a762355e4b0ac42
Author: Father Chrysostomos <[email protected]>
Date:   Sun Oct 19 11:06:48 2014 -0700

    Fix crash with ‘join,’ caused by 987c96916
-----------------------------------------------------------------------

Summary of changes:
 op.c           | 9 +++++----
 t/lib/croak/op | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/op.c b/op.c
index e28cc54..47d02ef 100644
--- a/op.c
+++ b/op.c
@@ -10643,10 +10643,11 @@ Perl_ck_join(pTHX_ OP *o)
                        SVfARG(msg), SVfARG(msg));
        }
     }
-    if (kid->op_type == OP_CONST  /* an innocent, unsuspicious separator */
-     || (kid->op_type == OP_PADSV && !(kid->op_private & OPpLVAL_INTRO))
-     || (kid->op_type==OP_RV2SV && kUNOP->op_first->op_type == OP_GV
-       && !(kid->op_private & (OPpLVAL_INTRO|OPpOUR_INTRO))))
+    if (kid
+     && (kid->op_type == OP_CONST /* an innocent, unsuspicious separator */
+       || (kid->op_type == OP_PADSV && !(kid->op_private & OPpLVAL_INTRO))
+       || (  kid->op_type==OP_RV2SV && kUNOP->op_first->op_type == OP_GV
+          && !(kid->op_private & (OPpLVAL_INTRO|OPpOUR_INTRO)))))
     {
        const OP * const bairn = OP_SIBLING(kid); /* the list */
        if (bairn && !OP_HAS_SIBLING(bairn) /* single-item list */
diff --git a/t/lib/croak/op b/t/lib/croak/op
index 8be9b12..d85ef73 100644
--- a/t/lib/croak/op
+++ b/t/lib/croak/op
@@ -1,4 +1,10 @@
 __END__
+# NAME join,
+join,
+EXPECT
+Not enough arguments for join or string at - line 1, near "join,"
+Execution of - aborted due to compilation errors.
+########
 # NAME my $<special>
 my $!;
 EXPECT

--
Perl5 Master Repository

Reply via email to