vendor/subversion/subversion-1.10.0

1 files changed, 3 insertions, 4 deletions

diff --git a/subversion/libsvn_subr/x509info.c b/subversion/libsvn_subr/x509info.c
index 351459629324..9cd437249118 100644
--- a/subversion/libsvn_subr/x509info.c
+++ b/subversion/libsvn_subr/x509info.c
@@ -41,8 +41,7 @@ svn_x509_name_attr_dup(const svn_x509_name_attr_t *attr,
 {
   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;
@@ -124,7 +123,7 @@ svn_x509_certinfo_dup(const svn_x509_certinfo_t *certinfo,
 
 typedef struct asn1_oid {
   const unsigned char *oid;
-  const ptrdiff_t oid_len;
+  const apr_size_t oid_len;
   const char *short_label;
   const char *long_label;
 } asn1_oid;
@@ -312,7 +311,7 @@ svn_x509_certinfo_get_valid_from(const svn_x509_certinfo_t *certinfo)
   return certinfo->valid_from;
 }
 
-const apr_time_t
+apr_time_t
 svn_x509_certinfo_get_valid_to(const svn_x509_certinfo_t *certinfo)
 {
   return certinfo->valid_to;