[PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

[PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

[GuoMinJ]

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

AllocatePool may fail and BinData may be invalid, check
it before use.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
---
 MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
index 6f7c31cab4..933d2b40e0 100644
--- a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
+++ b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
@@ -252,6 +252,9 @@ RfcDecodeTest(
   BinSize = AsciiStrnLenS (binString, MAX_TEST_STRING_SIZE);
 
   BinData = AllocatePool (BinSize);
+  if (BinData == NULL) {
+    return UNIT_TEST_ERROR_TEST_FAILED;
+  }
   Btc->BufferToFree = BinData;
 
   ReturnSize = BinSize;
-- 
2.17.1

Re: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

[Guomin Jiang]

Hi Michael, Liming,

Could you help review the patch.

Thanks.

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> GuoMinJ
> Sent: Thursday, March 5, 2020 1:58 PM
> To: devel@edk2.groups.io
> Cc: GuoMinJ <newexplorerj@gmail.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for
> pointer BinData
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2531
> 
> AllocatePool may fail and BinData may be invalid, check it before use.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
> ---
>  MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> index 6f7c31cab4..933d2b40e0 100644
> --- a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> +++ b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> @@ -252,6 +252,9 @@ RfcDecodeTest(
>    BinSize = AsciiStrnLenS (binString, MAX_TEST_STRING_SIZE);
> 
>    BinData = AllocatePool (BinSize);
> +  if (BinData == NULL) {
> +    return UNIT_TEST_ERROR_TEST_FAILED;  }
>    Btc->BufferToFree = BinData;
> 
>    ReturnSize = BinSize;
> --
> 2.17.1
> 
> 
> 

Re: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

[Liming Gao]

Guomin:
  The change is ok to me. Reviewed-by: Liming Gao <liming.gao@intel.com>

Thanks
Liming
> -----Original Message-----
> From: Jiang, Guomin <guomin.jiang@intel.com>
> Sent: Monday, March 23, 2020 2:12 PM
> To: devel@edk2.groups.io; newexplorerj@gmail.com
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: RE: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData
> 
> Hi Michael, Liming,
> 
> Could you help review the patch.
> 
> Thanks.
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> > GuoMinJ
> > Sent: Thursday, March 5, 2020 1:58 PM
> > To: devel@edk2.groups.io
> > Cc: GuoMinJ <newexplorerj@gmail.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com>
> > Subject: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for
> > pointer BinData
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2531
> >
> > AllocatePool may fail and BinData may be invalid, check it before use.
> >
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Cc: Liming Gao <liming.gao@intel.com>
> > Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
> > ---
> >  MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > index 6f7c31cab4..933d2b40e0 100644
> > --- a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > +++ b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > @@ -252,6 +252,9 @@ RfcDecodeTest(
> >    BinSize = AsciiStrnLenS (binString, MAX_TEST_STRING_SIZE);
> >
> >    BinData = AllocatePool (BinSize);
> > +  if (BinData == NULL) {
> > +    return UNIT_TEST_ERROR_TEST_FAILED;  }
> >    Btc->BufferToFree = BinData;
> >
> >    ReturnSize = BinSize;
> > --
> > 2.17.1
> >
> >
> > 

Re: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

[Michael D Kinney]

Guomin,

In the function RfcEncodeTest() above, the following code 
is used to make sure an allocated buffer is not NULL.

  b64WorkString = (CHAR8 *) AllocatePool(b64StringSize);
  UT_ASSERT_NOT_NULL(b64WorkString);

We should use the same style in both functions.

Thanks,

Mike

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Monday, March 23, 2020 6:34 AM
> To: Jiang, Guomin <guomin.jiang@intel.com>;
> devel@edk2.groups.io; newexplorerj@gmail.com
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [edk2-devel] [PATCH v3]
> MdePkg/UnitTestBaseLib: Add check for pointer BinData
> 
> Guomin:
>   The change is ok to me. Reviewed-by: Liming Gao
> <liming.gao@intel.com>
> 
> Thanks
> Liming
> > -----Original Message-----
> > From: Jiang, Guomin <guomin.jiang@intel.com>
> > Sent: Monday, March 23, 2020 2:12 PM
> > To: devel@edk2.groups.io; newexplorerj@gmail.com
> > Cc: Kinney, Michael D <michael.d.kinney@intel.com>;
> Gao, Liming <liming.gao@intel.com>
> > Subject: RE: [edk2-devel] [PATCH v3]
> MdePkg/UnitTestBaseLib: Add check for pointer BinData
> >
> > Hi Michael, Liming,
> >
> > Could you help review the patch.
> >
> > Thanks.
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of
> > > GuoMinJ
> > > Sent: Thursday, March 5, 2020 1:58 PM
> > > To: devel@edk2.groups.io
> > > Cc: GuoMinJ <newexplorerj@gmail.com>; Kinney,
> Michael D
> > > <michael.d.kinney@intel.com>; Gao, Liming
> <liming.gao@intel.com>
> > > Subject: [edk2-devel] [PATCH v3]
> MdePkg/UnitTestBaseLib: Add check for
> > > pointer BinData
> > >
> > > REF:
> https://bugzilla.tianocore.org/show_bug.cgi?id=2531
> > >
> > > AllocatePool may fail and BinData may be invalid,
> check it before use.
> > >
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Cc: Liming Gao <liming.gao@intel.com>
> > > Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
> > > ---
> > >
> MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c |
> 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git
> a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > >
> b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > > index 6f7c31cab4..933d2b40e0 100644
> > > ---
> a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > > +++
> b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > > @@ -252,6 +252,9 @@ RfcDecodeTest(
> > >    BinSize = AsciiStrnLenS (binString,
> MAX_TEST_STRING_SIZE);
> > >
> > >    BinData = AllocatePool (BinSize);
> > > +  if (BinData == NULL) {
> > > +    return UNIT_TEST_ERROR_TEST_FAILED;  }
> > >    Btc->BufferToFree = BinData;
> > >
> > >    ReturnSize = BinSize;
> > > --
> > > 2.17.1
> > >
> > >
> > > 

Re: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

[Bret Barkelew]

[-- Attachment #1: Type: text/plain, Size: 3700 bytes --]

Agree.

- Bret

________________________________
From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Michael D Kinney via Groups.Io <michael.d.kinney=intel.com@groups.io>
Sent: Monday, March 23, 2020 11:16:15 AM
To: Gao, Liming <liming.gao@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>; devel@edk2.groups.io <devel@edk2.groups.io>; newexplorerj@gmail.com <newexplorerj@gmail.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Subject: [EXTERNAL] Re: [edk2-devel] [PATCH v3] MdePkg/UnitTestBaseLib: Add check for pointer BinData

Guomin,

In the function RfcEncodeTest() above, the following code
is used to make sure an allocated buffer is not NULL.

  b64WorkString = (CHAR8 *) AllocatePool(b64StringSize);
  UT_ASSERT_NOT_NULL(b64WorkString);

We should use the same style in both functions.

Thanks,

Mike

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Monday, March 23, 2020 6:34 AM
> To: Jiang, Guomin <guomin.jiang@intel.com>;
> devel@edk2.groups.io; newexplorerj@gmail.com
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [edk2-devel] [PATCH v3]
> MdePkg/UnitTestBaseLib: Add check for pointer BinData
>
> Guomin:
>   The change is ok to me. Reviewed-by: Liming Gao
> <liming.gao@intel.com>
>
> Thanks
> Liming
> > -----Original Message-----
> > From: Jiang, Guomin <guomin.jiang@intel.com>
> > Sent: Monday, March 23, 2020 2:12 PM
> > To: devel@edk2.groups.io; newexplorerj@gmail.com
> > Cc: Kinney, Michael D <michael.d.kinney@intel.com>;
> Gao, Liming <liming.gao@intel.com>
> > Subject: RE: [edk2-devel] [PATCH v3]
> MdePkg/UnitTestBaseLib: Add check for pointer BinData
> >
> > Hi Michael, Liming,
> >
> > Could you help review the patch.
> >
> > Thanks.
> >
> > > -----Original Message-----
> > > From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of
> > > GuoMinJ
> > > Sent: Thursday, March 5, 2020 1:58 PM
> > > To: devel@edk2.groups.io
> > > Cc: GuoMinJ <newexplorerj@gmail.com>; Kinney,
> Michael D
> > > <michael.d.kinney@intel.com>; Gao, Liming
> <liming.gao@intel.com>
> > > Subject: [edk2-devel] [PATCH v3]
> MdePkg/UnitTestBaseLib: Add check for
> > > pointer BinData
> > >
> > > REF:
> https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugzilla.tianocore.org%2Fshow_bug.cgi%3Fid%3D2531&amp;data=02%7C01%7Cbret.barkelew%40microsoft.com%7C238d3abd482e45ac697708d7cf564945%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637205841811948950&amp;sdata=4I%2B8toPls61MZnTLofea5pjkiC%2Bqnt3uG6j2HYHhORA%3D&amp;reserved=0
> > >
> > > AllocatePool may fail and BinData may be invalid,
> check it before use.
> > >
> > > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > > Cc: Liming Gao <liming.gao@intel.com>
> > > Signed-off-by: GuoMinJ <newexplorerj@gmail.com>
> > > ---
> > >
> MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c |
> 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git
> a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > >
> b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > > index 6f7c31cab4..933d2b40e0 100644
> > > ---
> a/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > > +++
> b/MdePkg/Test/UnitTest/Library/BaseLib/Base64UnitTest.c
> > > @@ -252,6 +252,9 @@ RfcDecodeTest(
> > >    BinSize = AsciiStrnLenS (binString,
> MAX_TEST_STRING_SIZE);
> > >
> > >    BinData = AllocatePool (BinSize);
> > > +  if (BinData == NULL) {
> > > +    return UNIT_TEST_ERROR_TEST_FAILED;  }
> > >    Btc->BufferToFree = BinData;
> > >
> > >    ReturnSize = BinSize;
> > > --
> > > 2.17.1
> > >
> > >
> > >





[-- Attachment #2: Type: text/html, Size: 6932 bytes --]