Fix compile warning on older GCC

GCC cannot, for each possible value of one variable such as "tssl",
keep track of which of all other variables such as "pubkey" and
"privkey" are uninitialized or not. Some GCC versions just assumes
the variable may be uninitialized if it cannot know. Some more recent
GCC versions seem to take the opposite approach.

Either way, a simple refactoring of the error handling eliminates
the uncertainity by making both the if and else clause definitely
set the variables "pubkey" and "privkey" to an initialized value,
so it now compiles fine.

Signed-off-by: Jonathan Wernberg <jonathaw@axis.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/e_tpm2.c b/e_tpm2.c
index 720d88b..5d003a4 100644
--- a/e_tpm2.c
+++ b/e_tpm2.c
@@ -372,27 +372,27 @@ static int tpm2_engine_load_key_core(ENGINE *e, EVP_PKEY **ppkey,
 	} else {
 		BIO_seek(bf, 0);
 		tssl = PEM_read_bio_TSSLOADABLE(bf, NULL, NULL, NULL);
-		if (tssl) {
-			/* have error from failed TSSPRIVKEY load */
-			ERR_clear_error();
-			type = tssl->type;
-			empty_auth = tssl->emptyAuth;
-			parent = tssl->parent;
-			pubkey = tssl->pubkey;
-			privkey = tssl->privkey;
-			policy = tssl->policy;
+		if (!tssl) {
+			if (!bio)
+				BIO_free(bf);
+			if (ppkey)
+				fprintf(stderr, "Failed to parse file %s\n", key_id);
+			return 0;
 		}
+
+		/* have error from failed TSSPRIVKEY load */
+		ERR_clear_error();
+		type = tssl->type;
+		empty_auth = tssl->emptyAuth;
+		parent = tssl->parent;
+		pubkey = tssl->pubkey;
+		privkey = tssl->privkey;
+		policy = tssl->policy;
 	}
 
 	if (!bio)
 		BIO_free(bf);
 
-	if (!tssl && !tpk) {
-		if (ppkey)
-			fprintf(stderr, "Failed to parse file %s\n", key_id);
-		return 0;
-	}
-
 	if (!ppkey) {
 		TSSLOADABLE_free(tssl);
 		TSSPRIVKEY_free(tpk);