[PATCH v2] UnitTestFrameworkPkg/UnitTestLib: Correct dereferred pointer

[PATCH v2] UnitTestFrameworkPkg/UnitTestLib: Correct dereferred pointer

[Guomin Jiang]

From: kuqin <kuqin@microsoft.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2609

SavedState is not sticky, copied pointer update will not change source
pointer

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
---
 UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c b/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c
index b136992d99..ba4b18568d 100644
--- a/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c
+++ b/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c
@@ -209,7 +209,6 @@ InitUnitTestFramework (
   EFI_STATUS                  Status;
   UNIT_TEST_FRAMEWORK_HANDLE  NewFrameworkHandle;
   UNIT_TEST_FRAMEWORK         *NewFramework;
-  UNIT_TEST_SAVE_HEADER       *SavedState;
 
   Status       = EFI_SUCCESS;
   NewFramework = NULL;
@@ -264,8 +263,7 @@ InitUnitTestFramework (
   // If there is a persisted context, load it now.
   //
   if (DoesCacheExist (NewFrameworkHandle)) {
-    SavedState = (UNIT_TEST_SAVE_HEADER *)NewFramework->SavedState;
-    Status = LoadUnitTestCache (NewFrameworkHandle, &SavedState);
+    Status = LoadUnitTestCache (NewFrameworkHandle,  (UNIT_TEST_SAVE_HEADER**)(&NewFramework->SavedState));
     if (EFI_ERROR (Status)) {
       //
       // Don't actually report it as an error, but emit a warning.
-- 
2.25.1.windows.1

Re: [PATCH v2] UnitTestFrameworkPkg/UnitTestLib: Correct dereferred pointer

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

Mike

> -----Original Message-----
> From: Jiang, Guomin <guomin.jiang@intel.com>
> Sent: Monday, April 13, 2020 6:33 PM
> To: devel@edk2.groups.io
> Cc: kuqin <kuqin@microsoft.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Sean Brogan
> <sean.brogan@microsoft.com>; Bret Barkelew
> <Bret.Barkelew@microsoft.com>
> Subject: [PATCH v2] UnitTestFrameworkPkg/UnitTestLib:
> Correct dereferred pointer
> 
> From: kuqin <kuqin@microsoft.com>
> 
> REF:
> https://bugzilla.tianocore.org/show_bug.cgi?id=2609
> 
> SavedState is not sticky, copied pointer update will
> not change source
> pointer
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Signed-off-by: Guomin Jiang <guomin.jiang@intel.com>
> ---
>  UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.c
> | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git
> a/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.
> c
> b/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.
> c
> index b136992d99..ba4b18568d 100644
> ---
> a/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.
> c
> +++
> b/UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLib.
> c
> @@ -209,7 +209,6 @@ InitUnitTestFramework (
>    EFI_STATUS                  Status;
> 
>    UNIT_TEST_FRAMEWORK_HANDLE  NewFrameworkHandle;
> 
>    UNIT_TEST_FRAMEWORK         *NewFramework;
> 
> -  UNIT_TEST_SAVE_HEADER       *SavedState;
> 
> 
> 
>    Status       = EFI_SUCCESS;
> 
>    NewFramework = NULL;
> 
> @@ -264,8 +263,7 @@ InitUnitTestFramework (
>    // If there is a persisted context, load it now.
> 
>    //
> 
>    if (DoesCacheExist (NewFrameworkHandle)) {
> 
> -    SavedState = (UNIT_TEST_SAVE_HEADER
> *)NewFramework->SavedState;
> 
> -    Status = LoadUnitTestCache (NewFrameworkHandle,
> &SavedState);
> 
> +    Status = LoadUnitTestCache (NewFrameworkHandle,
> (UNIT_TEST_SAVE_HEADER**)(&NewFramework->SavedState));
> 
>      if (EFI_ERROR (Status)) {
> 
>        //
> 
>        // Don't actually report it as an error, but
> emit a warning.
> 
> --
> 2.25.1.windows.1