diff --git a/src/tpm12/tpm_delegate.c b/src/tpm12/tpm_delegate.c
index 51d12f34..37ebc022 100644
--- a/src/tpm12/tpm_delegate.c
+++ b/src/tpm12/tpm_delegate.c
@@ -1629,7 +1629,7 @@ TPM_RESULT TPM_Process_DelegateManage(tpm_state_t *tpm_state,
     TPM_SECRET			*hmacKey;
     TPM_SECRET			savedAuth;		/* saved copy for response */
     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
-    TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
+    TPM_FAMILY_TABLE_ENTRY	*familyRow = NULL;	/* family table row containing familyID */
     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
 							/* temp for noOwnerNVWrite, initialize to
 							   silence compiler */
@@ -3360,7 +3360,7 @@ TPM_RESULT TPM_Process_DelegateUpdateVerification(tpm_state_t *tpm_state,
     TPM_DELEGATE_INDEX		d1DelegateIndex;
     TPM_DELEGATE_OWNER_BLOB	d1DelegateOwnerBlob;
     TPM_DELEGATE_KEY_BLOB	d1DelegateKeyBlob;
-    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow;
+    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow = NULL;
     TPM_FAMILY_ID		familyID = 0;
     TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
diff --git a/src/tpm12/tpm_session.c b/src/tpm12/tpm_session.c
index 5e7b7083..15b977fc 100644
--- a/src/tpm12/tpm_session.c
+++ b/src/tpm12/tpm_session.c
@@ -3044,7 +3044,7 @@ TPM_RESULT TPM_Process_SaveContext(tpm_state_t *tpm_state,
     TPM_STORE_BUFFER		b1_sbuffer;		/* serialization of b1 */
     TPM_STCLEAR_DATA		*v1StClearData = NULL;
     TPM_KEY_HANDLE_ENTRY	*tpm_key_handle_entry;	/* key table entry for the handle */
-    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data; /* session table entry for the handle */
+    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data = NULL; /* session table entry for the handle */
     TPM_TRANSPORT_INTERNAL	*tpm_transport_internal; /* transport table entry for the handle */
     TPM_DAA_SESSION_DATA	*tpm_daa_session_data;	/* daa session table entry for the handle */
     TPM_NONCE			*n1ContextNonce = NULL;