root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

put_str: Use memcpy instead of strncpy 

This fixes a warning from latest gcc.

There is no point in using strncpy here as we
intentionally copy only the string contents without
the terminating NUL. The len is set from strlen().

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/18628)
This commit is contained in:
Tomas Mraz 2022-06-22 12:50:52 +02:00
parent 3ae326d4d8
commit bfa5f0f574
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/property/property_parse.c
View File

@ -577,7 +577,7 @@ static void put_char(char ch, char **buf, size_t *remain, size_t *needed)
++*needed;
return;
}
if(*remain == 1)
if (*remain == 1)
**buf = '\0';
else
**buf = ch;
@ -596,16 +596,16 @@ static void put_str(const char *str, char **buf, size_t *remain, size_t *needed)
if (*remain == 0)
return;
if(*remain < len + 1)
if (*remain < len + 1)
len = *remain - 1;
if(len > 0) {
strncpy(*buf, str, len);
if (len > 0) {
memcpy(*buf, str, len);
*buf += len;
*remain -= len;
}
if(len < olen && *remain == 1) {
if (len < olen && *remain == 1) {
**buf = '\0';
++*buf;
--*remain;