sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools/C/Common: Avoid possible NULL pointer dereference

Browse Source 
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Hao Wu
2016-09-20 20:53:31 +08:00
parent e7700cedd9
commit 2ff3293d7b
6 changed files with 93 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
BaseTools/Source/C/Common/MyAlloc.c
View File

@ -1,7 +1,7 @@
/** @file
File for memory allocation tracking functions.
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@ -73,7 +73,18 @@ MyCheck (
//
// Check parameters.
//
if (File == NULL || Line == 0) {
if (File == NULL) {
printf (
"\nMyCheck(Final=%u, File=NULL, Line=%u)"
"Invalid parameter(s).\n",
Final,
(unsigned)Line
);
exit (1);
}
if (Line == 0) {
printf (
"\nMyCheck(Final=%u, File=%s, Line=%u)"
"Invalid parameter(s).\n",
@ -190,7 +201,18 @@ MyAlloc (
//
// Check for invalid parameters.
//
if (Size == 0 || File == NULL || Line == 0) {
if (File == NULL) {
printf (
"\nMyAlloc(Size=%u, File=NULL, Line=%u)"
"\nInvalid parameter(s).\n",
(unsigned)Size,
(unsigned)Line
);
exit (1);
}
if (Size == 0 || Line == 0) {
printf (
"\nMyAlloc(Size=%u, File=%s, Line=%u)"
"\nInvalid parameter(s).\n",
@ -303,7 +325,19 @@ MyRealloc (
//
// Check for invalid parameter(s).
//
if (Size == 0 || File == NULL || Line == 0) {
if (File == NULL) {
printf (
"\nMyRealloc(Ptr=%p, Size=%u, File=NULL, Line=%u)"
"\nInvalid parameter(s).\n",
Ptr,
(unsigned)Size,
(unsigned)Line
);
exit (1);
}
if (Size == 0 || Line == 0) {
printf (
"\nMyRealloc(Ptr=%p, Size=%u, File=%s, Line=%u)"
"\nInvalid parameter(s).\n",
@ -408,7 +442,18 @@ MyFree (
//
// Check for invalid parameter(s).
//
if (File == NULL || Line == 0) {
if (File == NULL) {
printf (
"\nMyFree(Ptr=%p, File=NULL, Line=%u)"
"\nInvalid parameter(s).\n",
Ptr,
(unsigned)Line
);
exit (1);
}
if (Line == 0) {
printf (
"\nMyFree(Ptr=%p, File=%s, Line=%u)"
"\nInvalid parameter(s).\n",