In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/f92b68087fa16c181807b1e16f020d76b45c4274?hp=76aae383784f602979d5efc9c8828918d67827d8>
- Log -----------------------------------------------------------------
commit f92b68087fa16c181807b1e16f020d76b45c4274
Author: Yves Orton <demer...@gmail.com>
Date: Fri Jun 2 04:17:51 2017 +0200
revert the Perl_croak_nocontext() change to PERL_HASH()
it only appeared to work, but actually was not being invoked in my testing.
Once it was tested properly it became clear that Perl_croak_nocontext()
is not always available where things are calling PERL_HASH(). Need to
investigate
further how to make this work.
M hv_func.h
commit f0df1bdecfbdfc617ef7adf558d84b8f5ded7f6d
Author: Yves Orton <demer...@gmail.com>
Date: Fri Jun 2 04:13:47 2017 +0200
fixup defines for SBOX mode
M hv_func.h
-----------------------------------------------------------------------
Summary of changes:
hv_func.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hv_func.h b/hv_func.h
index da3744239e..4be4214293 100644
--- a/hv_func.h
+++ b/hv_func.h
@@ -73,7 +73,7 @@
#endif
-#if PERL_HASH_USE_SBOX32_ALSO == 1
+#if PERL_HASH_USE_SBOX32_ALSO != 1
# define _PERL_HASH_FUNC __PERL_HASH_FUNC
# define _PERL_HASH_SEED_BYTES __PERL_HASH_SEED_BYTES
# define _PERL_HASH_STATE_BYTES __PERL_HASH_STATE_BYTES
@@ -86,19 +86,17 @@
#define _PERL_HASH_SEED_BYTES ( __PERL_HASH_SEED_BYTES + ( 3 * sizeof(U32) )
)
#define _PERL_HASH_STATE_BYTES \
- ( __PERL_HASH_SEED_BYTES + ( ( 1 + ( 256 * SBOX32_MAX_LEN ) ) *
sizeof(U32) ) )
+ ( __PERL_HASH_STATE_BYTES + ( ( 1 + ( 256 * SBOX32_MAX_LEN ) ) *
sizeof(U32) ) )
#define _PERL_HASH_SEED_STATE(seed,state) STMT_START {
\
__PERL_HASH_SEED_STATE(seed,state);
\
- sbox32_seed_state96(seed + __PERL_HASH_SEED_BYTES , state +
__PERL_HASH_STATE_BYTES); \
+ sbox32_seed_state96(seed + __PERL_HASH_SEED_BYTES, state +
__PERL_HASH_STATE_BYTES); \
} STMT_END
#define _PERL_HASH_WITH_STATE(state,str,len)
\
(LIKELY(len <= SBOX32_MAX_LEN)
\
? sbox32_hash_with_state((state +
__PERL_HASH_STATE_BYTES),(U8*)(str),(len)) \
- : UNLIKELY(len > (STRLEN) I32_MAX)
\
- ? Perl_croak_nocontext("Sorry, hash keys must be smaller than 2**31
bytes") \
- : __PERL_HASH_WITH_STATE((state),(str),(len)))
+ : __PERL_HASH_WITH_STATE((state),(str),(len)))
#endif
--
Perl5 Master Repository
