public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Hao Wu <hao.a.wu@intel.com>
To: edk2-devel@lists.01.org
Cc: Hao Wu <hao.a.wu@intel.com>, Liming Gao <liming.gao@intel.com>,
	Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH v2 49/53] BaseTools/VolInfo: Provide string width in '%s' specifier in format string
Date: Thu,  3 Nov 2016 15:22:59 +0800	[thread overview]
Message-ID: <1478157783-9368-50-git-send-email-hao.a.wu@intel.com> (raw)
In-Reply-To: <1478157783-9368-1-git-send-email-hao.a.wu@intel.com>

String width is not specified for '%s' specifier in the format string for
scanf functions.

This commit now specifies the string length for '%s' in format strings
according to the size of receiving buffers.

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>
---
 BaseTools/Source/C/VolInfo/VolInfo.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c
index 07840bf..5285acd 100644
--- a/BaseTools/Source/C/VolInfo/VolInfo.c
+++ b/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -2178,6 +2178,8 @@ Returns:
 {
   FILE              *Fptr;
   CHAR8             Line[MAX_LINE_LEN];
+  CHAR8             *FormatString;
+  INTN              FormatLength;
   GUID_TO_BASENAME  *GPtr;
 
   if ((Fptr = fopen (LongFilePath (FileName), "r")) == NULL) {
@@ -2185,18 +2187,44 @@ Returns:
     return EFI_DEVICE_ERROR;
   }
 
+  //
+  // Generate the format string for fscanf
+  //
+  FormatLength = snprintf (
+                   NULL,
+                   0,
+                   "%%%us %%%us",
+                   (unsigned) sizeof (GPtr->Guid) - 1,
+                   (unsigned) sizeof (GPtr->BaseName) - 1
+                   ) + 1;
+
+  FormatString = (CHAR8 *) malloc (FormatLength);
+  if (FormatString == NULL) {
+    fclose (Fptr);
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  snprintf (
+    FormatString,
+    FormatLength,
+    "%%%us %%%us",
+    (unsigned) sizeof (GPtr->Guid) - 1,
+    (unsigned) sizeof (GPtr->BaseName) - 1
+    );
+
   while (fgets (Line, sizeof (Line), Fptr) != NULL) {
     //
     // Allocate space for another guid/basename element
     //
     GPtr = malloc (sizeof (GUID_TO_BASENAME));
     if (GPtr == NULL) {
+      free (FormatString);
       fclose (Fptr);
       return EFI_OUT_OF_RESOURCES;
     }
 
     memset ((char *) GPtr, 0, sizeof (GUID_TO_BASENAME));
-    if (sscanf (Line, "%s %s", GPtr->Guid, GPtr->BaseName) == 2) {
+    if (sscanf (Line, FormatString, GPtr->Guid, GPtr->BaseName) == 2) {
       GPtr->Next        = mGuidBaseNameList;
       mGuidBaseNameList = GPtr;
     } else {
@@ -2207,6 +2235,7 @@ Returns:
     }
   }
 
+  free (FormatString);
   fclose (Fptr);
   return EFI_SUCCESS;
 }
-- 
1.9.5.msysgit.0



  parent reply	other threads:[~2016-11-03  7:24 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-03  7:22 [PATCH v2 00/53] Resolve issues for C source codes in BaseTools Hao Wu
2016-11-03  7:22 ` [PATCH v2 01/53] BaseTools/C/Common: Avoid possible NULL pointer dereference Hao Wu
2016-11-03  7:22 ` [PATCH v2 02/53] BaseTools/EfiRom: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 03/53] BaseTools/GenFfs: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 04/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 05/53] BaseTools/GenFw: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 06/53] BaseTools/GenPage: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 07/53] BaseTools/GenSec: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 08/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 09/53] BaseTools/TianoCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 10/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 11/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 12/53] BaseTools/TianoCompress: Initialize local variables before being used Hao Wu
2016-11-03  7:22 ` [PATCH v2 13/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 14/53] BaseTools/GenBootSector: Fix parameter format mismatch in printf functions Hao Wu
2016-11-03  7:22 ` [PATCH v2 15/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 16/53] BaseTools/C/Common: Fix parameter format mismatch in scanf functions Hao Wu
2016-11-03  7:22 ` [PATCH v2 17/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 18/53] BaseTools/GenFw: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 19/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 20/53] BaseTools/C/Common: Add checks for array access Hao Wu
2016-11-03  7:22 ` [PATCH v2 21/53] BaseTools/TianoCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 22/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 23/53] BaseTools/EfiRom: Add checks for user/file inputs Hao Wu
2016-11-03  7:22 ` [PATCH v2 24/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 25/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 26/53] BaseTools/VfrCompile: Avoid freeing memory with mismatched functions Hao Wu
2016-11-03  7:22 ` [PATCH v2 27/53] BaseTools/VfrCompile: Add assignment operator definition for some classes Hao Wu
2016-11-03  7:22 ` [PATCH v2 28/53] BaseTools/VfrCompile: Avoid freeing freed memory in classes Hao Wu
2016-11-03  7:22 ` [PATCH v2 29/53] BaseTools/VfrCompile: Remove unused local variables Hao Wu
2016-11-03  7:22 ` [PATCH v2 30/53] BaseTools/C/Common: Fix potential memory leak Hao Wu
2016-11-03  7:22 ` [PATCH v2 31/53] BaseTools/EfiRom: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 32/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 33/53] BaseTools/GenPage: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 34/53] BaseTools/GenSec: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 35/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 36/53] BaseTools/Split: Fix potential memory and resource leak Hao Wu
2016-11-03  7:22 ` [PATCH v2 37/53] BaseTools/TianoCompress: Fix potential memory leak Hao Wu
2016-11-03  7:22 ` [PATCH v2 38/53] BaseTools/VfrCompile: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 39/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 40/53] BaseTools/EfiRom: Fix file handles not being closed Hao Wu
2016-11-03  7:22 ` [PATCH v2 41/53] BaseTools/GenBootSector: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 42/53] BaseTools/GenCrc32: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 43/53] BaseTools/GenFv: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 44/53] BaseTools/GenVtf: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 45/53] BaseTools/LzmaCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 46/53] BaseTools/TianoCompress: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 47/53] BaseTools/VolInfo: " Hao Wu
2016-11-03  7:22 ` [PATCH v2 48/53] BaseTools/GenVtf: Provide string width in '%s' specifier in format string Hao Wu
2016-11-03  7:22 ` Hao Wu [this message]
2016-11-03  7:23 ` [PATCH v2 50/53] BaseTools/VfrCompile: Explicitly state format string for DebugMsg() Hao Wu
2016-11-03  7:23 ` [PATCH v2 51/53] BaseTools/VolInfo: Add definitions for command format strings Hao Wu
2016-11-03  7:23 ` [PATCH v2 52/53] BaseTools/VfrCompile/Pccts: Add virtual destructor for class DLGInputStream Hao Wu
2016-11-03  7:23 ` [PATCH v2 53/53] BaseTools/VfrCompile/Pccts: Make assignment operator not returning void Hao Wu
2016-11-08  1:05 ` [PATCH v2 00/53] Resolve issues for C source codes in BaseTools Gao, Liming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478157783-9368-50-git-send-email-hao.a.wu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox