BaseTools/C/Common: Add checks for array access

[mirror_edk2.git] / BaseTools / Source / C / Common / CommonLib.c

diff --git a/BaseTools/Source/C/Common/CommonLib.c b/BaseTools/Source/C/Common/CommonLib.c
index 2d07dfc667b19b3c9fc3c7cef7af1b713ff6b6c4..2f0aecf252409778090e33127ce482a5d2de80c5 100644 (file)
--- a/BaseTools/Source/C/Common/CommonLib.c
+++ b/BaseTools/Source/C/Common/CommonLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 Common basic Library Functions\r
 \r
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -652,7 +652,11 @@ Returns:
     //\r
     // Construct the full file path\r
     //\r
-    strcat (mCommonLibFullPath, FileName);\r
+    if (strlen (mCommonLibFullPath) + strlen (FileName) > MAX_LONG_FILE_PATH - 1) {\r
+      Error (NULL, 0, 2000, "Invalid parameter", "FileName %s is too long!", FileName);\r
+      return NULL;\r
+    }\r
+    strncat (mCommonLibFullPath, FileName, MAX_LONG_FILE_PATH - strlen (mCommonLibFullPath) - 1);\r
     \r
     //\r
     // Convert directory separator '/' to '\\'\r