From d32531edac750e434365d45e1e6c5851cff15c52 Mon Sep 17 00:00:00 2001
From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 17 Jun 2009 17:51:31 +0000
Subject: [PATCH] In the previous patch - I neglected a potential NULL deref in
 the call to krb5int_yarrow_cipher_final.  Trivial fix.

ticket: 6512

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22413 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/crypto/yarrow/yarrow.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/crypto/yarrow/yarrow.c b/src/lib/crypto/yarrow/yarrow.c
index 9e3c91588..ff25fa9c5 100644
--- a/src/lib/crypto/yarrow/yarrow.c
+++ b/src/lib/crypto/yarrow/yarrow.c
@@ -917,9 +917,11 @@ int krb5int_yarrow_final(Yarrow_CTX* y)
 #endif
 
  CATCH:
-    krb5int_yarrow_cipher_final(&y->cipher);
     if ( y ) 
+    {
+	krb5int_yarrow_cipher_final(&y->cipher);
 	mem_zero( y, sizeof(Yarrow_CTX) );
+    }
     if ( locked ) { TRY( UNLOCK() ); }
     EXCEP_RET;
 }
-- 
2.26.2