In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/345db0f66ed0ac7b609bb6bcceaf3a48b5f8e25b?hp=686bf123c667c94009c4d74361205d229cb91f7d>
- Log ----------------------------------------------------------------- commit 345db0f66ed0ac7b609bb6bcceaf3a48b5f8e25b Author: Yves Orton <demer...@gmail.com> Date: Sun Feb 25 15:03:57 2018 +0100 Storable: when building in core do not run stacksize every time commit f1d945b85ac2d18ddd1ed2e1d4f72011246d905a Author: Yves Orton <demer...@gmail.com> Date: Sun Feb 25 14:29:03 2018 +0100 if an SV IsCOW_shared_hash then we can assume it has a null at the end ----------------------------------------------------------------------- Summary of changes: dist/Storable/__Storable__.pm | 2 +- dist/Storable/stacksize | 1 + regcomp.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/Storable/__Storable__.pm b/dist/Storable/__Storable__.pm index 52ce1629e5..f7acfebd3d 100644 --- a/dist/Storable/__Storable__.pm +++ b/dist/Storable/__Storable__.pm @@ -27,7 +27,7 @@ our @EXPORT_OK = qw( our ($canonical, $forgive_me); -our $VERSION = '3.06'; +our $VERSION = '3.07'; our $recursion_limit; our $recursion_limit_hash; diff --git a/dist/Storable/stacksize b/dist/Storable/stacksize index 394e6aab23..27aa6f357b 100644 --- a/dist/Storable/stacksize +++ b/dist/Storable/stacksize @@ -45,6 +45,7 @@ elsif (system("ulimit -c 0 ;") == 0) { } if (@ARGV and $ARGV[0] eq '--core') { $ENV{PERL_CORE} = 1; + exit if -e "dist/Storable/$fn"; } my $PERL = $^X; if ($ENV{PERL_CORE}) { diff --git a/regcomp.c b/regcomp.c index 446f0bf839..f8d9771a57 100644 --- a/regcomp.c +++ b/regcomp.c @@ -6510,7 +6510,7 @@ S_concat_pat(pTHX_ RExC_state_t * const pRExC_state, * it is properly null terminated or we will fail asserts * later. In theory we probably shouldn't get such SV's, * but if we do we should handle it gracefully. */ - if ( SvTYPE(msv) != SVt_PV || (SvLEN(msv) > SvCUR(msv) && *(SvEND(msv)) == 0) ) { + if ( SvTYPE(msv) != SVt_PV || (SvLEN(msv) > SvCUR(msv) && *(SvEND(msv)) == 0) || SvIsCOW_shared_hash(msv) ) { /* not a string, or a string with a trailing null */ pat = msv; } else { -- Perl5 Master Repository