summaryrefslogtreecommitdiff
path: root/src/lib/libssl/d1_both.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/d1_both.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/d1_both.c')
-rw-r--r--src/lib/libssl/d1_both.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index 0e32825695..59987bc1d8 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -200,8 +200,7 @@ dtls1_hm_fragment_new(unsigned long frag_len, int reassembly)
200 if (reassembly) { 200 if (reassembly) {
201 bitmask = malloc(RSMBLY_BITMASK_SIZE(frag_len)); 201 bitmask = malloc(RSMBLY_BITMASK_SIZE(frag_len));
202 if (bitmask == NULL) { 202 if (bitmask == NULL) {
203 if (buf != NULL) 203 free(buf);
204 free(buf);
205 free(frag); 204 free(frag);
206 return NULL; 205 return NULL;
207 } 206 }
@@ -223,10 +222,8 @@ dtls1_hm_fragment_free(hm_fragment *frag)
223 EVP_MD_CTX_destroy( 222 EVP_MD_CTX_destroy(
224 frag->msg_header.saved_retransmit_state.write_hash); 223 frag->msg_header.saved_retransmit_state.write_hash);
225 } 224 }
226 if (frag->fragment) 225 free(frag->fragment);
227 free(frag->fragment); 226 free(frag->reassembly);
228 if (frag->reassembly)
229 free(frag->reassembly);
230 free(frag); 227 free(frag);
231} 228}
232 229