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

ssl: drop multiplication by sizeof(char) in allocation size calculations 

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28059)
This commit is contained in:
Eugene Syromiatnikov 2025-07-17 10:41:07 +02:00 committed by Neil Horman
parent 313c12125e
commit c4a91d5c26
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssl/t1_lib.c
View File

@ -1334,9 +1334,10 @@ static int gid_cb(const char *elem, int len, void *arg)
* First, we restore any keyshare prefix in a new zero-terminated string
* (if not already present)
*/
restored_default_group_string = OPENSSL_malloc((1 /* max prefix length */ +
strlen(default_group_strings[i].group_string) +
1 /* \0 */) * sizeof(char));
restored_default_group_string =
OPENSSL_malloc(1 /* max prefix length */ +
strlen(default_group_strings[i].group_string) +
1 /* \0 */);
if (restored_default_group_string == NULL)
return 0;
if (add_keyshare
@ -1552,7 +1553,7 @@ static int tuple_cb(const char *tuple, int len, void *arg)
}
/* Convert to \0-terminated string */
restored_tuple_string = OPENSSL_malloc((len + 1 /* \0 */) * sizeof(char));
restored_tuple_string = OPENSSL_malloc(len + 1 /* \0 */);
if (restored_tuple_string == NULL)
return 0;
memcpy(restored_tuple_string, tuple, len);