In perl.git, the branch blead has been updated

<https://perl5.git.perl.org/perl.git/commitdiff/6623aa6a6b84e22d8d692825a9686006b6811b78?hp=8f2f8ba04ea23881d72a9cbfd11eb9d2c04eab24>

- Log -----------------------------------------------------------------
commit 6623aa6a6b84e22d8d692825a9686006b6811b78
Author: David Mitchell <[email protected]>
Date:   Tue Nov 14 13:27:59 2017 +0000

    OP_MULTICONCAT: fix AIX
    
    The OP_MULTICONCAT work broke AIX builds because it turns out that
    PerlMemShared_malloc() isn't safe (in the sense of safemalloc());
    i.e. on AIX, PerlMemShared_malloc(0) returns NULL.

-----------------------------------------------------------------------

Summary of changes:
 op.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op.c b/op.c
index 18631d0059..8fa5aad876 100644
--- a/op.c
+++ b/op.c
@@ -3043,7 +3043,7 @@ S_maybe_multiconcat(pTHX_ OP *o)
                          + ((nargs + 1) * (variant ? 2 : 1))
                         )
                     );
-    const_str = (char *)PerlMemShared_malloc(total_len);
+    const_str = (char *)PerlMemShared_malloc(total_len ? total_len : 1);
 
     /* Extract all the non-const expressions from the concat tree then
      * dispose of the old tree, e.g. convert the tree from this:

-- 
Perl5 Master Repository

Reply via email to