Fix CID 1540730, 1540707, 1540701: Uninitialized variables (UNINIT)

rnpgp · Mar 28, 2024 · f464275 · f464275
1 parent 232716e
commit f464275
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/key-provider.cpp b/src/lib/key-provider.cpp
@@ -97,22 +97,24 @@ KeySearch::create(const std::string &name, const std::string &value)
             return nullptr;
         }
         return create(pgp_fingerprint_t(binval));
-    case Type::KeyID:
+    case Type::KeyID: {
         if (binval.size() != PGP_KEY_ID_SIZE) {
             RNP_LOG("Invalid keyid: %s", value.c_str());
             return nullptr;
         }
-        pgp_key_id_t keyid;
+        pgp_key_id_t keyid{};
         memcpy(keyid.data(), binval.data(), keyid.size());
         return create(keyid);
-    case Type::Grip:
+    }
+    case Type::Grip: {
         if (binval.size() != PGP_KEY_GRIP_SIZE) {
             RNP_LOG("Invalid grip: %s", value.c_str());
             return nullptr;
         }
-        pgp_key_grip_t grip;
+        pgp_key_grip_t grip{};
         memcpy(grip.data(), binval.data(), grip.size());
         return create(grip);
+    }
     default:
         return nullptr;
     }

diff --git a/src/librekey/key_store_g10.cpp b/src/librekey/key_store_g10.cpp
@@ -908,7 +908,7 @@ KeyStore::load_g10(pgp_source_t &src, const KeyProvider *key_provider)
         /* copy public key fields if any */
         pgp_key_t key;
         if (key_provider) {
-            pgp_key_grip_t grip;
+            pgp_key_grip_t grip{};
             if (!seckey.material.get_grip(grip)) {
                 return false;
             }