]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Coverity 1528486: Avoid assignment of unused value of bags
authorTomas Mraz <tomas@openssl.org>
Wed, 7 Jun 2023 12:28:58 +0000 (14:28 +0200)
committerTodd Short <todd.short@me.com>
Sat, 10 Jun 2023 23:23:59 +0000 (19:23 -0400)
It is used only within the loop and always initialized

apps/pkcs12.c

index 823d97085d8a616f99727600f3e6a2809dc1f764..857a2a10c09a090684a4e67b6d7a1b1160305cc9 100644 (file)
@@ -899,7 +899,6 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
                         const EVP_CIPHER *enc)
 {
     STACK_OF(PKCS7) *asafes = NULL;
-    STACK_OF(PKCS12_SAFEBAG) *bags;
     int i, bagnid;
     int ret = 0;
     PKCS7 *p7;
@@ -907,6 +906,8 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
     if ((asafes = PKCS12_unpack_authsafes(p12)) == NULL)
         return 0;
     for (i = 0; i < sk_PKCS7_num(asafes); i++) {
+        STACK_OF(PKCS12_SAFEBAG) *bags;
+
         p7 = sk_PKCS7_value(asafes, i);
         bagnid = OBJ_obj2nid(p7->type);
         if (bagnid == NID_pkcs7_data) {
@@ -922,7 +923,7 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
         } else {
             continue;
         }
-        if (!bags)
+        if (bags == NULL)
             goto err;
         if (!dump_certs_pkeys_bags(out, bags, pass, passlen,
                                    options, pempass, enc)) {
@@ -930,7 +931,6 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
             goto err;
         }
         sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
-        bags = NULL;
     }
     ret = 1;