diff --git a/crypto/asn1/asn1_test.cc b/crypto/asn1/asn1_test.cc
index 91ba691e33..70b9dd5213 100644
--- a/crypto/asn1/asn1_test.cc
+++ b/crypto/asn1/asn1_test.cc
@@ -2315,7 +2315,7 @@ const struct GetObjectTestData {
     {{0x61, 0x80, 0xC2, 0x02, 0xAB, 0xCD, 0x00, 0x00}, 0x21, 0x01, 0x40, 0},
 };
 
-static void verifyGetObject(GetObjectTestData t) {
+static void verifyGetObject(const GetObjectTestData& t) {
   long length;
   int tag;
   int tag_class;
diff --git a/crypto/pkcs7/pkcs7.c b/crypto/pkcs7/pkcs7.c
index 3e2a097699..984b6b56e9 100644
--- a/crypto/pkcs7/pkcs7.c
+++ b/crypto/pkcs7/pkcs7.c
@@ -644,7 +644,6 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg) {
     OPENSSL_PUT_ERROR(PKCS7, ERR_R_BIO_LIB);
     goto err;
   }
-  btmp = NULL;
 
   return 1;
 
@@ -1014,7 +1013,7 @@ OPENSSL_END_ALLOW_DEPRECATED
   if (si_sk != NULL) {
     for (size_t ii = 0; ii < sk_PKCS7_SIGNER_INFO_num(si_sk); ii++) {
       si = sk_PKCS7_SIGNER_INFO_value(si_sk, ii);
-      if (si->pkey == NULL) {
+      if (si == NULL || si->pkey == NULL) {
         continue;
       }
       int sign_nid = OBJ_obj2nid(si->digest_alg->algorithm);