projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0819130
)
Fix memory leak in BIO_free if there is no destroy function.
author
Matt Caswell
<matt@openssl.org>
Wed, 9 Jul 2014 22:29:17 +0000
(23:29 +0100)
committer
Matt Caswell
<matt@openssl.org>
Wed, 9 Jul 2014 22:37:04 +0000
(23:37 +0100)
Based on an original patch by Neitrino Photonov <neitrinoph@gmail.com>
PR#3439
(cherry picked from commit
66816c53bea0ecddb9448da7ea9a51a334496127
)
crypto/bio/bio_lib.c
patch
|
blob
|
history
diff --git
a/crypto/bio/bio_lib.c
b/crypto/bio/bio_lib.c
index 9c9646afa8a22c3a6a208877c76e7f92d8458f31..4793a453e4afa22f3431c9daf39eec93e71fc020 100644
(file)
--- a/
crypto/bio/bio_lib.c
+++ b/
crypto/bio/bio_lib.c
@@
-132,8
+132,8
@@
int BIO_free(BIO *a)
CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
- if ((a->method
== NULL) || (a->method->destroy == NULL)) return(1);
- a->method->destroy(a);
+ if ((a->method
!= NULL) && (a->method->destroy != NULL))
+
a->method->destroy(a);
OPENSSL_free(a);
return(1);
}