[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5e04cfdef345c69a4bb04db81766702f994172f3 (commit)
      from  aacfb134be2a88211b79dc53bb5bd0e422dbb60d (commit)


- Log -----------------------------------------------------------------
commit 5e04cfdef345c69a4bb04db81766702f994172f3
Author: Dmitry-Me <wipedout at yandex.ru>
Date:   Tue Mar 1 11:48:15 2016 +0300

    GH769: Reuse strndup()
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Signed-off-by: Rich Salz <rsalz at akamai.com>

-----------------------------------------------------------------------

Summary of changes:
 crypto/x509v3/v3_alt.c  | 4 +---
 crypto/x509v3/v3_info.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index b2914ee..4b143f9 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -577,11 +577,9 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
     if ((gen->d.otherName->value = ASN1_generate_v3(p + 1, ctx)) == NULL)
         return 0;
     objlen = p - value;
-    objtmp = OPENSSL_malloc(objlen + 1);
+    objtmp = OPENSSL_strndup(value, objlen);
     if (objtmp == NULL)
         return 0;
-    strncpy(objtmp, value, objlen);
-    objtmp[objlen] = 0;
     gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
     OPENSSL_free(objtmp);
     if (!gen->d.otherName->type_id)
diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c
index a7ea19a..16e25fa 100644
--- a/crypto/x509v3/v3_info.c
+++ b/crypto/x509v3/v3_info.c
@@ -177,13 +177,11 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
         ctmp.value = cnf->value;
         if (!v2i_GENERAL_NAME_ex(acc->location, method, ctx, &ctmp, 0))
             goto err;
-        if ((objtmp = OPENSSL_malloc(objlen + 1)) == NULL) {
+        if ((objtmp = OPENSSL_strndup(cnf->name, objlen)) == NULL) {
             X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,
                       ERR_R_MALLOC_FAILURE);
             goto err;
         }
-        strncpy(objtmp, cnf->name, objlen);
-        objtmp[objlen] = 0;
         acc->method = OBJ_txt2obj(objtmp, 0);
         if (!acc->method) {
             X509V3err(X509V3_F_V2I_AUTHORITY_INFO_ACCESS,