You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/05/12 16:10:49 UTC
svn commit: r1678950 -
/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
Author: ivan
Date: Tue May 12 14:10:49 2015
New Revision: 1678950
URL: http://svn.apache.org/r1678950
Log:
Attempt to fix cache-test#8 test failures on platforms that doesn't allow
unaligned access.
* subversion/libsvn_subr/cache-membuffer.c
(combine_key): Do not access caller provided KEY as apr_uint64_t*. Use
memcpy instead.
Modified:
subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1678950&r1=1678949&r2=1678950&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Tue May 12 14:10:49 2015
@@ -2658,17 +2658,7 @@ combine_key(svn_membuffer_cache_t *cache
apr_uint64_t data[2];
/* short, fixed-size keys are the most common case */
- if (key_len == 16)
- {
- data[0] = ((const apr_uint64_t *)key)[0];
- data[1] = ((const apr_uint64_t *)key)[1];
- }
- else if (key_len == 8)
- {
- data[0] = ((const apr_uint64_t *)key)[0];
- data[1] = 0;
- }
- else if (key_len != APR_HASH_KEY_STRING && key_len < 16)
+ if (key_len != APR_HASH_KEY_STRING && key_len < 16)
{
data[0] = 0;
data[1] = 0;