Cleanup OPENSSL_NO_xxx, part 1

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

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index e9e7c4a65b6140e57bd7dd7e4ee46321764e0d18..ea1410dd74e3fa202d1a25f1e58af05e11c66a6c 100644 (file)
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -366,6 +366,7 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
                 if (move_p)
                         {
                         X509_NAME_delete_entry(nm, i);
+                       X509_NAME_ENTRY_free(ne);
                         i--;
                         }
                if(!email || !(gen = GENERAL_NAME_new())) {
@@ -464,6 +465,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
                        }
                gen->d.rid = obj;
                }
+               break;
 
                case GEN_IPADD:
                if (is_nc)
@@ -492,6 +494,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
                        X509V3err(X509V3_F_A2I_GENERAL_NAME,X509V3_R_OTHERNAME_ERROR);
                        goto err;
                        }
+               break;
                default:
                X509V3err(X509V3_F_A2I_GENERAL_NAME,X509V3_R_UNSUPPORTED_TYPE);
                goto err;
@@ -513,7 +516,8 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
        return gen;
 
        err:
-       GENERAL_NAME_free(gen);
+       if (!out)
+               GENERAL_NAME_free(gen);
        return NULL;
        }
 
@@ -575,6 +579,8 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
                return 0;
        objlen = p - value;
        objtmp = OPENSSL_malloc(objlen + 1);
+       if (objtmp == NULL)
+               return 0;
        strncpy(objtmp, value, objlen);
        objtmp[objlen] = 0;
        gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
@@ -604,6 +610,7 @@ static int do_dirname(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
        if (!ret)
                X509_NAME_free(nm);
        gen->d.dirn = nm;
+       X509V3_section_free(ctx, sk);
                
        return ret;
        }