diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2017-12-18 14:26:12 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2017-12-25 09:54:18 +0800 |
| commit | 3e1497334e45d09b8eccbc24ca571308e015e995 (patch) | |
| tree | 7399ded3c9648b4c43fbf2d3a7c89ba6696c0d30 | |
| parent | 938cf4b9bd91167e4de637de3c1e7fa449e9de94 (diff) | |
| download | edk2-3e1497334e45d09b8eccbc24ca571308e015e995.zip edk2-3e1497334e45d09b8eccbc24ca571308e015e995.tar.gz edk2-3e1497334e45d09b8eccbc24ca571308e015e995.tar.bz2 | |
BaseTools/C/Common: Refine using sprintf() with '%s' in format string
The commit removes the usages of sprintf() function calls with '%s' in
the format string. And uses strncpy/strncat instead to ensure the
destination string buffers will not be accessed beyond their boundary.
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
| -rw-r--r-- | BaseTools/Source/C/Common/EfiUtilityMsgs.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/BaseTools/Source/C/Common/EfiUtilityMsgs.c b/BaseTools/Source/C/Common/EfiUtilityMsgs.c index 5496a43..44925c6 100644 --- a/BaseTools/Source/C/Common/EfiUtilityMsgs.c +++ b/BaseTools/Source/C/Common/EfiUtilityMsgs.c @@ -462,10 +462,11 @@ Notes: );
}
if (Cptr != NULL) {
- sprintf (Line, ": %s", Cptr);
+ strcpy (Line, ": ");
+ strncat (Line, Cptr, MAX_LINE_LEN - strlen (Line) - 1);
if (LineNumber != 0) {
sprintf (Line2, "(%u)", (unsigned) LineNumber);
- strcat (Line, Line2);
+ strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
}
}
} else {
@@ -476,14 +477,16 @@ Notes: if (mUtilityName[0] != '\0') {
fprintf (stdout, "%s...\n", mUtilityName);
}
- sprintf (Line, "%s", Cptr);
+ strncpy (Line, Cptr, MAX_LINE_LEN - 1);
+ Line[MAX_LINE_LEN - 1] = 0;
if (LineNumber != 0) {
sprintf (Line2, "(%u)", (unsigned) LineNumber);
- strcat (Line, Line2);
+ strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
}
} else {
if (mUtilityName[0] != '\0') {
- sprintf (Line, "%s", mUtilityName);
+ strncpy (Line, mUtilityName, MAX_LINE_LEN - 1);
+ Line[MAX_LINE_LEN - 1] = 0;
}
}
@@ -501,12 +504,12 @@ Notes: // Have to print an error code or Visual Studio won't find the
// message for you. It has to be decimal digits too.
//
+ strncat (Line, ": ", MAX_LINE_LEN - strlen (Line) - 1);
+ strncat (Line, Type, MAX_LINE_LEN - strlen (Line) - 1);
if (MessageCode != 0) {
- sprintf (Line2, ": %s %04u", Type, (unsigned) MessageCode);
- } else {
- sprintf (Line2, ": %s", Type);
+ sprintf (Line2, " %04u", (unsigned) MessageCode);
+ strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
}
- strcat (Line, Line2);
fprintf (stdout, "%s", Line);
//
// If offending text was provided, then print it
|