X509: add more error codes on malloc or sk_TYP_push failure

[openssl.git] / crypto / x509v3 / pcy_data.c

diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509v3/pcy_data.c
index 757b101dd6aefe353600e2f2152e4b2b2d289e4b..7b75a6d8b0cd8675de55ae1300eeaad93f35fbc9 100644 (file)
--- a/crypto/x509v3/pcy_data.c
+++ b/crypto/x509v3/pcy_data.c
@@ -40,6 +40,7 @@ X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
 {
     X509_POLICY_DATA *ret;
     ASN1_OBJECT *id;
 {
     X509_POLICY_DATA *ret;
     ASN1_OBJECT *id;

+

     if (policy == NULL && cid == NULL)
         return NULL;
     if (cid) {
     if (policy == NULL && cid == NULL)
         return NULL;
     if (cid) {


@@ -49,12 +50,15 @@ X509_POLICY_DATA *policy_data_new(POLICYINFO *policy,
     } else
         id = NULL;
     ret = OPENSSL_zalloc(sizeof(*ret));
     } else
         id = NULL;
     ret = OPENSSL_zalloc(sizeof(*ret));

-    if (ret == NULL)
+    if (ret == NULL) {
+        X509V3err(X509V3_F_POLICY_DATA_NEW, ERR_R_MALLOC_FAILURE);

         return NULL;
         return NULL;

+    }

     ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
     if (ret->expected_policy_set == NULL) {
         OPENSSL_free(ret);
         ASN1_OBJECT_free(id);
     ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
     if (ret->expected_policy_set == NULL) {
         OPENSSL_free(ret);
         ASN1_OBJECT_free(id);

+        X509V3err(X509V3_F_POLICY_DATA_NEW, ERR_R_MALLOC_FAILURE);

         return NULL;
     }
 
         return NULL;
     }