[PATCH] SignedCapsulePkg IniParsingLib: ASSERT to ensure 'Value' is not NULL

[PATCH] SignedCapsulePkg IniParsingLib: ASSERT to ensure 'Value' is not NULL

[Hao Wu]

Function GetStringFromDataFile() ensures its fourth (output) parameter
will not be NULL when the return status is EFI_SUCCESS.

This commit adds ASSERT as warnings for the case that will not happen.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
index a8773c1..5c975f7 100644
--- a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
+++ b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
@@ -1257,6 +1257,7 @@ GetGuidFromDataFile (
   if (EFI_ERROR(Status)) {
     return EFI_NOT_FOUND;
   }
+  ASSERT (Value != NULL);
   if (!IsValidGuid(Value, AsciiStrLen(Value))) {
     return EFI_NOT_FOUND;
   }
@@ -1303,6 +1304,7 @@ GetDecimalUintnFromDataFile (
   if (EFI_ERROR(Status)) {
     return EFI_NOT_FOUND;
   }
+  ASSERT (Value != NULL);
   if (!IsValidDecimalString(Value, AsciiStrLen(Value))) {
     return EFI_NOT_FOUND;
   }
@@ -1346,6 +1348,7 @@ GetHexUintnFromDataFile (
   if (EFI_ERROR(Status)) {
     return EFI_NOT_FOUND;
   }
+  ASSERT (Value != NULL);
   if (!IsValidHexString(Value, AsciiStrLen(Value))) {
     return EFI_NOT_FOUND;
   }
@@ -1389,6 +1392,7 @@ GetHexUint64FromDataFile (
   if (EFI_ERROR(Status)) {
     return EFI_NOT_FOUND;
   }
+  ASSERT (Value != NULL);
   if (!IsValidHexString(Value, AsciiStrLen(Value))) {
     return EFI_NOT_FOUND;
   }
-- 
1.9.5.msysgit.0

Re: [PATCH] SignedCapsulePkg IniParsingLib: ASSERT to ensure 'Value' is not NULL

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Wu, Hao A
> Sent: Wednesday, November 16, 2016 4:26 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH] SignedCapsulePkg IniParsingLib: ASSERT to ensure 'Value' is
> not NULL
> 
> Function GetStringFromDataFile() ensures its fourth (output) parameter
> will not be NULL when the return status is EFI_SUCCESS.
> 
> This commit adds ASSERT as warnings for the case that will not happen.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
>  SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
> b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
> index a8773c1..5c975f7 100644
> --- a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
> +++ b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c
> @@ -1257,6 +1257,7 @@ GetGuidFromDataFile (
>    if (EFI_ERROR(Status)) {
>      return EFI_NOT_FOUND;
>    }
> +  ASSERT (Value != NULL);
>    if (!IsValidGuid(Value, AsciiStrLen(Value))) {
>      return EFI_NOT_FOUND;
>    }
> @@ -1303,6 +1304,7 @@ GetDecimalUintnFromDataFile (
>    if (EFI_ERROR(Status)) {
>      return EFI_NOT_FOUND;
>    }
> +  ASSERT (Value != NULL);
>    if (!IsValidDecimalString(Value, AsciiStrLen(Value))) {
>      return EFI_NOT_FOUND;
>    }
> @@ -1346,6 +1348,7 @@ GetHexUintnFromDataFile (
>    if (EFI_ERROR(Status)) {
>      return EFI_NOT_FOUND;
>    }
> +  ASSERT (Value != NULL);
>    if (!IsValidHexString(Value, AsciiStrLen(Value))) {
>      return EFI_NOT_FOUND;
>    }
> @@ -1389,6 +1392,7 @@ GetHexUint64FromDataFile (
>    if (EFI_ERROR(Status)) {
>      return EFI_NOT_FOUND;
>    }
> +  ASSERT (Value != NULL);
>    if (!IsValidHexString(Value, AsciiStrLen(Value))) {
>      return EFI_NOT_FOUND;
>    }
> --
> 1.9.5.msysgit.0