svn commit: r1681994 - in /subversion/trunk/subversion: libsvn_fs_fs/temp_serializer.c libsvn_subr/mergeinfo.c libsvn_subr/x509info.c libsvn_subr/x509parse.c

[iv...@apache.org]

Author: ivan
Date: Wed May 27 11:55:05 2015
New Revision: 1681994

URL: http://svn.apache.org/r1681994
Log:
* subversion/libsvn_fs_fs/temp_serializer.c
* subversion/libsvn_subr/mergeinfo.c
* subversion/libsvn_subr/x509info.c
* subversion/libsvn_subr/x509parse.c
  (svn_fs_fs__serialize_manifest, svn_fs_fs__extract_dir_entry,
   svn_x509_name_attr_dup, x509_name_to_certinfo): Use apr_pmemdup()
   instead of apr_palloc() following memcpy().

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/trunk/subversion/libsvn_subr/mergeinfo.c
    subversion/trunk/subversion/libsvn_subr/x509info.c
    subversion/trunk/subversion/libsvn_subr/x509parse.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1681994&r1=1681993&r2=1681994&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Wed May 27 11:55:05 2015
@@ -507,8 +507,7 @@ svn_fs_fs__serialize_manifest(void **dat
   apr_array_header_t *manifest = in;
 
   *data_len = sizeof(apr_off_t) *manifest->nelts;
-  *data = apr_palloc(pool, *data_len);
-  memcpy(*data, manifest->elts, *data_len);
+  *data = apr_pmemdup(pool, manifest->elts, *data_len);
 
   return SVN_NO_ERROR;
 }
@@ -915,8 +914,7 @@ svn_fs_fs__extract_dir_entry(void **out,
       apr_size_t size = lengths[pos];
 
       /* copy & deserialize the entry */
-      svn_fs_dirent_t *new_entry = apr_palloc(pool, size);
-      memcpy(new_entry, source, size);
+      svn_fs_dirent_t *new_entry = apr_pmemdup(pool, source, size);
 
       svn_temp_deserializer__resolve(new_entry, (void **)&new_entry->name);
       svn_fs_fs__id_deserialize(new_entry, (svn_fs_id_t **)&new_entry->id);

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1681994&r1=1681993&r2=1681994&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Wed May 27 11:55:05 2015
@@ -2306,8 +2306,7 @@ svn_rangelist_dup(const svn_rangelist_t
 svn_merge_range_t *
 svn_merge_range_dup(const svn_merge_range_t *range, apr_pool_t *pool)
 {
-  svn_merge_range_t *new_range = apr_palloc(pool, sizeof(*new_range));
-  memcpy(new_range, range, sizeof(*new_range));
+  svn_merge_range_t *new_range = apr_pmemdup(pool, range, sizeof(*new_range));
   return new_range;
 }
 

Modified: subversion/trunk/subversion/libsvn_subr/x509info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/x509info.c?rev=1681994&r1=1681993&r2=1681994&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/x509info.c (original)
+++ subversion/trunk/subversion/libsvn_subr/x509info.c Wed May 27 11:55:05 2015
@@ -41,8 +41,7 @@ svn_x509_name_attr_dup(const svn_x509_na
 {
   svn_x509_name_attr_t *result = apr_palloc(result_pool, sizeof(*result));
   result->oid_len = attr->oid_len;
-  result->oid = apr_palloc(result_pool, result->oid_len);
-  memcpy(result->oid, attr->oid, result->oid_len);
+  result->oid = apr_pmemdup(result_pool, attr->oid, attr->oid_len);
   result->utf8_value = apr_pstrdup(result_pool, attr->utf8_value);
 
   return result;

Modified: subversion/trunk/subversion/libsvn_subr/x509parse.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/x509parse.c?rev=1681994&r1=1681993&r2=1681994&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/x509parse.c (original)
+++ subversion/trunk/subversion/libsvn_subr/x509parse.c Wed May 27 11:55:05 2015
@@ -919,8 +919,7 @@ x509_name_to_certinfo(apr_array_header_t
     svn_x509_name_attr_t *attr = apr_palloc(result_pool, sizeof(svn_x509_name_attr_t));
 
     attr->oid_len = name->oid.len;
-    attr->oid = apr_palloc(result_pool, attr->oid_len);
-    memcpy(attr->oid, name->oid.p, attr->oid_len);
+    attr->oid = apr_pmemdup(result_pool, name->oid.p, attr->oid_len);
     attr->utf8_value = x509name_to_utf8_string(name, result_pool);
     if (!attr->utf8_value)
       /* this should never happen */