From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: Oliver Steffen <osteffen@redhat.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Guomin Jiang <guomin.jiang@intel.com>,
Jian J Wang <jian.j.wang@intel.com>,
Xiaoyu Lu <xiaoyux.lu@intel.com>,
Pawel Polawski <ppolawsk@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH v2 7/8] CryptoPkg/CrtLibSupport: fix strcpy
Date: Fri, 8 Apr 2022 13:16:21 +0200 [thread overview]
Message-ID: <20220408111622.3519517-8-kraxel@redhat.com> (raw)
In-Reply-To: <20220408111622.3519517-1-kraxel@redhat.com>
strcpy() returns a pointer to the destination string, AsciiStrCpyS()
does not. So a simple #define does not work. Create a inline function
instead.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
CryptoPkg/Library/Include/CrtLibSupport.h | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
index 287d7f76bfb3..7c1bc7755b1c 100644
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -395,6 +395,16 @@ inet_pton (
void *
);
+static inline char *
+strcpy (
+ char *restrict strDest,
+ const char *strSource
+ )
+{
+ AsciiStrCpyS (strDest, MAX_STRING_SIZE, strSource);
+ return strDest;
+}
+
//
// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
//
@@ -404,7 +414,6 @@ inet_pton (
#define memcmp(buf1, buf2, count) (int)(CompareMem(buf1,buf2,(UINTN)(count)))
#define memmove(dest, source, count) CopyMem(dest,source,(UINTN)(count))
#define strlen(str) (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE))
-#define strcpy(strDest, strSource) AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource)
#define strncpy(strDest, strSource, count) AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count)
#define strcat(strDest, strSource) AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource)
#define strncmp(string1, string2, count) (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))
--
2.35.1
next prev parent reply other threads:[~2022-04-08 11:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-08 11:16 [PATCH v2 0/8] CryptoPkg updates for openssl 3.0 Gerd Hoffmann
2022-04-08 11:16 ` [PATCH v2 1/8] CryptoPkg/CrtLibSupport: add fcntl.h Gerd Hoffmann
2022-04-08 11:16 ` [PATCH v2 2/8] CryptoPkg/CrtLibSupport: add strstr() Gerd Hoffmann
2022-04-08 11:16 ` [PATCH v2 3/8] CryptoPkg/CrtLibSupport: add INT_MIN Gerd Hoffmann
2022-04-08 11:16 ` [PATCH v2 4/8] CryptoPkg/CrtLibSupport: add UINT_MAX Gerd Hoffmann
2022-04-08 11:16 ` [PATCH v2 5/8] CryptoPkg/CrtLibSupport: add MODULESDIR Gerd Hoffmann
2022-04-08 11:16 ` [PATCH v2 6/8] CryptoPkg/CrtLibSupport: add off_t Gerd Hoffmann
2022-04-08 11:16 ` Gerd Hoffmann [this message]
2022-04-08 12:18 ` [PATCH v2 7/8] CryptoPkg/CrtLibSupport: fix strcpy Yao, Jiewen
2022-04-11 6:58 ` Gerd Hoffmann
2022-04-11 7:26 ` Yao, Jiewen
2022-04-08 11:16 ` [PATCH v2 8/8] CryptoPkg/UnitTest: fix DH testcase Gerd Hoffmann
2022-04-08 12:18 ` [PATCH v2 0/8] CryptoPkg updates for openssl 3.0 Yao, Jiewen
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=20220408111622.3519517-8-kraxel@redhat.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