libkmod/libkmod-signature: fold a few NULL checks

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/427
Signed-off-by: Lucas De Marchi <demarchi@kernel.org>

diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index 698b02e5833e4fd1baef1706d71987da287858a9..4cd8948898cb5b4feaa6ed0c33865b5fd3c3f87d 100644 (file)
--- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c
@@ -189,18 +189,13 @@ static bool fill_pkcs7(const char *mem, off_t size, size_t sig_len,
                goto err;
 
        si = sk_PKCS7_SIGNER_INFO_value(sis, 0);
-       if (si == NULL)
+       if (si == NULL || si->issuer_and_serial == NULL || si->enc_digest == NULL)
                goto err;
 
        is = si->issuer_and_serial;
-       if (is == NULL)
-               goto err;
        issuer = is->issuer;
        sno = is->serial;
-
        sig = si->enc_digest;
-       if (sig == NULL)
-               goto err;
 
        PKCS7_SIGNER_INFO_get0_algs(si, NULL, &dig_alg, NULL);