From 1a6fdcb009f9c4afad6dd6706264f970e69ed603 Mon Sep 17 00:00:00 2001 From: qianouyang Date: Wed, 17 Oct 2012 05:46:53 +0000 Subject: [PATCH] Fix code potential errors in IPsec. Signed-off-by: qianouyang Reviewed-by: ydong10 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13856 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/IpSecDxe/IpSecDebug.c | 14 +++++++------- NetworkPkg/IpSecDxe/IpSecDebug.h | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/NetworkPkg/IpSecDxe/IpSecDebug.c b/NetworkPkg/IpSecDxe/IpSecDebug.c index 56b35a1a14..636e775969 100644 --- a/NetworkPkg/IpSecDxe/IpSecDebug.c +++ b/NetworkPkg/IpSecDxe/IpSecDebug.c @@ -19,7 +19,7 @@ // // The print title for IKEv1 variety phase. // -CHAR8 *mIkev1StateStr[] = { +CHAR8 *mIkev1StateStr[IKE_STATE_NUM] = { "IKEv1_MAIN_1", "IKEv1_MAIN_2", "IKEv1_MAIN_3", @@ -32,7 +32,7 @@ CHAR8 *mIkev1StateStr[] = { // // The print title for IKEv2 variety phase. // -CHAR8 *mIkev2StateStr[] = { +CHAR8 *mIkev2StateStr[IKE_STATE_NUM] = { "IKEv2_STATE_INIT", "IKEv2_STATE_AUTH", "IKEv2_STATE_SA_ESTABLISH", @@ -166,23 +166,23 @@ IkeDumpState ( IN UINT8 IkeVersion ) { + if (Previous >= IKE_STATE_NUM || Current >= IKE_STATE_NUM) { + return; + } if (Previous == Current) { if (IkeVersion == 1) { DEBUG ((DEBUG_INFO, "\n****Current state is %a\n", mIkev1StateStr[Previous])); } else if (IkeVersion == 2) { DEBUG ((DEBUG_INFO, "\n****Current state is %a\n", mIkev2StateStr[Previous])); - } - + } } else { if (IkeVersion == 1) { DEBUG ((DEBUG_INFO, "\n****Change state from %a to %a\n", mIkev1StateStr[Previous], mIkev1StateStr[Current])); } else { DEBUG ((DEBUG_INFO, "\n****Change state from %a to %a\n", mIkev2StateStr[Previous], mIkev2StateStr[Current])); - } - + } } - } /** diff --git a/NetworkPkg/IpSecDxe/IpSecDebug.h b/NetworkPkg/IpSecDxe/IpSecDebug.h index d44677f300..16bbcd53c6 100644 --- a/NetworkPkg/IpSecDxe/IpSecDebug.h +++ b/NetworkPkg/IpSecDxe/IpSecDebug.h @@ -27,6 +27,8 @@ #define IPSEC_DUMP_BUF(Title, Data, DataSize) IpSecDumpBuf (Title, Data, DataSize) #define IPSEC_DEBUG_BYTE_PER_LINE 8 +#define IKE_STATE_NUM 7 + /** -- 2.39.2