← Back to branch summary

~tangent-org/libmemcached/1.0-build

« back to all changes in this revision

Viewing changes to libmemcached/stats.cc

  • Committer: Continuous Integration
  • Date: 2012-12-31 10:53:13 UTC
  • mfrom: (1121.1.14 libmemcached-1.0)
  • Revision ID: ci@tangent.org-20121231105313-fjxoa7lih4i5h5q8
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-181

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmemcached/stats.cc
232
232
{
233
233
  char buffer[SMALL_STRING_LEN];
234
234
  int length;
235
 
  char *ret;
236
235
 
237
236
  *error= MEMCACHED_SUCCESS;
238
237
 
336
335
    return NULL;
337
336
  }
338
337
 
339
 
  ret= static_cast<char *>(libmemcached_malloc(ptr, (size_t) (length + 1)));
 
338
  // User is responsible for free() memory, so use malloc()
 
339
  char *ret= static_cast<char *>(malloc(size_t(length +1)));
340
340
  memcpy(ret, buffer, (size_t) length);
341
341
  ret[length]= '\0';
342
342