* [PATCH v2] MdeModulePkg CapsuleApp: ASSERT to ensure 'CapsuleIndex' is not NULL
@ 2016-11-21 7:50 Hao Wu
2016-11-21 7:57 ` Yao, Jiewen
0 siblings, 1 reply; 2+ messages in thread
From: Hao Wu @ 2016-11-21 7:50 UTC (permalink / raw)
To: edk2-devel; +Cc: Hao Wu, Jiewen Yao
Function GetVariable2() ensures its third (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>
---
MdeModulePkg/Application/CapsuleApp/CapsuleDump.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
index 9291ba3..d09b938 100644
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
@@ -285,6 +285,7 @@ DmpCapsuleStatusVariable (
NULL
);
if (!EFI_ERROR(Status)) {
+ ASSERT (CapsuleIndex != NULL);
CopyMem(CapsuleIndexData, CapsuleIndex, 11 * sizeof(CHAR16));
CapsuleIndexData[11] = 0;
Print(L"CapsuleMax - %s\n", CapsuleIndexData);
@@ -297,6 +298,7 @@ DmpCapsuleStatusVariable (
NULL
);
if (!EFI_ERROR(Status)) {
+ ASSERT (CapsuleIndex != NULL);
CopyMem(CapsuleIndexData, CapsuleIndex, 11 * sizeof(CHAR16));
CapsuleIndexData[11] = 0;
Print(L"CapsuleLast - %s\n", CapsuleIndexData);
--
1.9.5.msysgit.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] MdeModulePkg CapsuleApp: ASSERT to ensure 'CapsuleIndex' is not NULL
2016-11-21 7:50 [PATCH v2] MdeModulePkg CapsuleApp: ASSERT to ensure 'CapsuleIndex' is not NULL Hao Wu
@ 2016-11-21 7:57 ` Yao, Jiewen
0 siblings, 0 replies; 2+ messages in thread
From: Yao, Jiewen @ 2016-11-21 7:57 UTC (permalink / raw)
To: Wu, Hao A, edk2-devel@lists.01.org
Reviewed-by: jiewen.yao@intel.com
> -----Original Message-----
> From: Wu, Hao A
> Sent: Monday, November 21, 2016 3:50 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH v2] MdeModulePkg CapsuleApp: ASSERT to ensure
> 'CapsuleIndex' is not NULL
>
> Function GetVariable2() ensures its third (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>
> ---
> MdeModulePkg/Application/CapsuleApp/CapsuleDump.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
> b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
> index 9291ba3..d09b938 100644
> --- a/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
> +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleDump.c
> @@ -285,6 +285,7 @@ DmpCapsuleStatusVariable (
> NULL
> );
> if (!EFI_ERROR(Status)) {
> + ASSERT (CapsuleIndex != NULL);
> CopyMem(CapsuleIndexData, CapsuleIndex, 11 * sizeof(CHAR16));
> CapsuleIndexData[11] = 0;
> Print(L"CapsuleMax - %s\n", CapsuleIndexData);
> @@ -297,6 +298,7 @@ DmpCapsuleStatusVariable (
> NULL
> );
> if (!EFI_ERROR(Status)) {
> + ASSERT (CapsuleIndex != NULL);
> CopyMem(CapsuleIndexData, CapsuleIndex, 11 * sizeof(CHAR16));
> CapsuleIndexData[11] = 0;
> Print(L"CapsuleLast - %s\n", CapsuleIndexData);
> --
> 1.9.5.msysgit.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-21 7:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-21 7:50 [PATCH v2] MdeModulePkg CapsuleApp: ASSERT to ensure 'CapsuleIndex' is not NULL Hao Wu
2016-11-21 7:57 ` Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox