[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4e0e4d293753a67e5771c98ec312a37ca54cc3b0 (commit)
      from  e073fd15b779aa9e3f8a6de167112d5a3ed3c82f (commit)


- Log -----------------------------------------------------------------
commit 4e0e4d293753a67e5771c98ec312a37ca54cc3b0
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Thu May 12 00:29:22 2016 +0200

    Fix some missing OBJ_dup failure checks.
    
    Fix some missing OBJ_dup failure checks.
    Merged from
    https://boringssl.googlesource.com/boringssl/+/0ce78a757d815c0dde9ed5884229f3a5b2cb3e9c%5E!
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1057)

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

Summary of changes:
 crypto/x509/x509_att.c | 2 +-
 crypto/x509/x509_v3.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index fb04cdc..8e2abdf 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -288,7 +288,7 @@ int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
         return (0);
     ASN1_OBJECT_free(attr->object);
     attr->object = OBJ_dup(obj);
-    return (1);
+    return attr->object != NULL;
 }
 
 int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index f3fe305..e835db7 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -235,7 +235,7 @@ int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj)
         return (0);
     ASN1_OBJECT_free(ex->object);
     ex->object = OBJ_dup(obj);
-    return (1);
+    return ex->object != NULL;
 }
 
 int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit)