summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlogan <>2014-06-21 09:10:30 +0000
committerlogan <>2014-06-21 09:10:30 +0000
commitad8d47ad97a6eda202961f498ac1757595f063c3 (patch)
tree336c0246a6851a4f3271765628c8cad6fe13e031
parenta24bfdad7fac42bad53f1f3d617ecd788ef69bfa (diff)
downloadopenbsd-ad8d47ad97a6eda202961f498ac1757595f063c3.tar.gz
openbsd-ad8d47ad97a6eda202961f498ac1757595f063c3.tar.bz2
openbsd-ad8d47ad97a6eda202961f498ac1757595f063c3.zip
Fix memory leak in error path.
OK from miod@
-rw-r--r--src/lib/libssl/src/ssl/ssl_cert.c4
-rw-r--r--src/lib/libssl/ssl_cert.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c
index 6527d4dfe4..0864fe8d99 100644
--- a/src/lib/libssl/src/ssl/ssl_cert.c
+++ b/src/lib/libssl/src/ssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.38 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.39 2014/06/21 09:10:30 logan Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -308,7 +308,7 @@ err:
308 X509_free(ret->pkeys[i].x509); 308 X509_free(ret->pkeys[i].x509);
309 EVP_PKEY_free(ret->pkeys[i].privatekey); 309 EVP_PKEY_free(ret->pkeys[i].privatekey);
310 } 310 }
311 311 free (ret);
312 return NULL; 312 return NULL;
313} 313}
314 314
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index 6527d4dfe4..0864fe8d99 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.38 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.39 2014/06/21 09:10:30 logan Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -308,7 +308,7 @@ err:
308 X509_free(ret->pkeys[i].x509); 308 X509_free(ret->pkeys[i].x509);
309 EVP_PKEY_free(ret->pkeys[i].privatekey); 309 EVP_PKEY_free(ret->pkeys[i].privatekey);
310 } 310 }
311 311 free (ret);
312 return NULL; 312 return NULL;
313} 313}
314 314