summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_enc.c
diff options
context:
space:
mode:
authorjsing <>2014-05-28 13:03:25 +0000
committerjsing <>2014-05-28 13:03:25 +0000
commit5e9669b813b32f5d5ca2ccb554e53000bd5a44d2 (patch)
tree60af46eb8cb0fcb0e51840739e416c98c124d73c /src/lib/libssl/t1_enc.c
parent7bcea0bcb0bff06b137f084c63c8bdfc7299b84a (diff)
downloadopenbsd-5e9669b813b32f5d5ca2ccb554e53000bd5a44d2.tar.gz
openbsd-5e9669b813b32f5d5ca2ccb554e53000bd5a44d2.tar.bz2
openbsd-5e9669b813b32f5d5ca2ccb554e53000bd5a44d2.zip
There is no point in checking if a pointer is non-NULL before calling free,
since free already does this for us. Also remove some pointless NULL assignments, where the result from malloc(3) is immediately assigned to the same variable. ok miod@
Diffstat (limited to 'src/lib/libssl/t1_enc.c')
-rw-r--r--src/lib/libssl/t1_enc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index a9be8bdb4c..7b4afa4d27 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1019,10 +1019,8 @@ err2:
1019 SSLerr(SSL_F_TLS1_EXPORT_KEYING_MATERIAL, ERR_R_MALLOC_FAILURE); 1019 SSLerr(SSL_F_TLS1_EXPORT_KEYING_MATERIAL, ERR_R_MALLOC_FAILURE);
1020 rv = 0; 1020 rv = 0;
1021ret: 1021ret:
1022 if (buff != NULL) 1022 free(buff);
1023 free(buff); 1023 free(val);
1024 if (val != NULL)
1025 free(val);
1026 return (rv); 1024 return (rv);
1027} 1025}
1028 1026