svn commit: r1679022 - /subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c

[iv...@apache.org]

Author: ivan
Date: Tue May 12 18:11:30 2015
New Revision: 1679022

URL: http://svn.apache.org/r1679022
Log:
On the '1.9-cache-improvements' branch: Fix buffer overflow bug in membuffer
cache.

* subversion/libsvn_subr/cache-membuffer.c
  (combine_long_key): Ensure that COMBINED_KEY.FULL_KEY buffer is big enough
   to fit padding.

Modified:
    subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c

Modified: subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c?rev=1679022&r1=1679021&r2=1679022&view=diff
==============================================================================
--- subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c Tue May 12 18:11:30 2015
@@ -2625,7 +2625,7 @@ combine_long_key(svn_membuffer_cache_t *
   /* Combine keys. */
   aligned_key_len = ALIGN_VALUE(key_len);
   svn_membuf__ensure(&cache->combined_key.full_key,
-                     key_len + prefix_len);
+                     aligned_key_len + prefix_len);
 
   key_copy = (char *)cache->combined_key.full_key.data + prefix_len;
   cache->combined_key.entry_key.key_len = aligned_key_len + prefix_len;