svn commit: r1570642 - /subversion/trunk/subversion/libsvn_subr/cache-memcache.c

[ph...@apache.org]

Author: philip
Date: Fri Feb 21 17:39:43 2014
New Revision: 1570642

URL: http://svn.apache.org/r1570642
Log:
Fix issue 4470, memcached caching causing a SEGV because the wrong
type is returned.

* subversion/libsvn_subr/cache-memcache.c
  (memcache_get): Return data wrapped in svn_stringbuf_t rather than
   svn_string_t.

Modified:
    subversion/trunk/subversion/libsvn_subr/cache-memcache.c

Modified: subversion/trunk/subversion/libsvn_subr/cache-memcache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-memcache.c?rev=1570642&r1=1570641&r2=1570642&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-memcache.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-memcache.c Fri Feb 21 17:39:43 2014
@@ -203,9 +203,9 @@ memcache_get(void **value_p,
         }
       else
         {
-          svn_string_t *value = apr_pcalloc(result_pool, sizeof(*value));
+          svn_stringbuf_t *value = svn_stringbuf_create_empty(result_pool);
           value->data = data;
-          value->len = data_len;
+          value->len = value->blocksize = data_len;
           *value_p = value;
         }
     }