mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-24 02:23:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary memset() to 0 and check for NULL before OPENSSL_free()

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Andrea Grandi 2016-02-27 06:14:49 +00:00 committed by Matt Caswell
parent 0ff4343575
commit b283968327
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/speed.c
View File

@ -1580,19 +1580,7 @@ int speed_main(int argc, char **argv)
loopargs[i].buf = loopargs[i].buf_malloc + misalign;
loopargs[i].buf2 = loopargs[i].buf2_malloc + misalign;
loopargs[i].siglen = app_malloc(sizeof(unsigned int), "signature length");
#ifndef OPENSSL_NO_DSA
memset(loopargs[i].dsa_key, 0, sizeof(loopargs[i].dsa_key));
#endif
#ifndef OPENSSL_NO_RSA
memset(loopargs[i].rsa_key, 0, sizeof(loopargs[i].rsa_key));
for (k = 0; k < RSA_NUM; k++)
loopargs[i].rsa_key[k] = NULL;
#endif
#ifndef OPENSSL_NO_EC
for (k = 0; k < EC_NUM; k++)
loopargs[i].ecdsa[k] = NULL;
for (k = 0; k < EC_NUM; k++)
loopargs[i].ecdh_a[k] = loopargs[i].ecdh_b[k] = NULL;
loopargs[i].secret_a = app_malloc(MAX_ECDH_SIZE, "ECDH secret a");
loopargs[i].secret_b = app_malloc(MAX_ECDH_SIZE, "ECDH secret b");
#endif
@ -2828,15 +2816,11 @@ int speed_main(int argc, char **argv)
end:
ERR_print_errors(bio_err);
for (i = 0; i < loopargs_len; i++) {
if (loopargs[i].buf_malloc != NULL)
OPENSSL_free(loopargs[i].buf_malloc);
if (loopargs[i].buf2_malloc != NULL)
OPENSSL_free(loopargs[i].buf2_malloc);
if (loopargs[i].siglen != NULL)
OPENSSL_free(loopargs[i].siglen);
OPENSSL_free(loopargs[i].buf_malloc);
OPENSSL_free(loopargs[i].buf2_malloc);
OPENSSL_free(loopargs[i].siglen);
}
if (loopargs != NULL)
OPENSSL_free(loopargs);
OPENSSL_free(loopargs);
#ifndef OPENSSL_NO_RSA
for (i = 0; i < loopargs_len; i++) {
for (k = 0; k < RSA_NUM; k++)
@ -2857,10 +2841,8 @@ int speed_main(int argc, char **argv)
EC_KEY_free(loopargs[i].ecdh_a[k]);
EC_KEY_free(loopargs[i].ecdh_b[k]);
}
if (loopargs[i].secret_a)
OPENSSL_free(loopargs[i].secret_a);
if (loopargs[i].secret_b)
OPENSSL_free(loopargs[i].secret_b);
OPENSSL_free(loopargs[i].secret_a);
OPENSSL_free(loopargs[i].secret_b);
}
#endif
if (async_jobs > 0)