summaryrefslogtreecommitdiffstats
path: root/x-net
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-03-24 17:01:22 -0700
committerKenny Root <kroot@google.com>2010-03-24 17:01:22 -0700
commit52ffacb002700a502fa7e490799d53bfdf7dbfe1 (patch)
treeeef5ee922a6e0a99cf33db164af0bb61ca79fc69 /x-net
parent654936d657fda3d7ef2682354615ea147f81a127 (diff)
downloadlibcore-52ffacb002700a502fa7e490799d53bfdf7dbfe1.zip
libcore-52ffacb002700a502fa7e490799d53bfdf7dbfe1.tar.gz
libcore-52ffacb002700a502fa7e490799d53bfdf7dbfe1.tar.bz2
Don't leak memory on failed pipe or mutex init
SSL allocation might fail on pipe or mutex creation, so free allocated memory when that happens. Change-Id: Ibe3813cb652db1e880e3acf0dc1fa37fbe0ad455
Diffstat (limited to 'x-net')
-rw-r--r--x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
index 407ca0d..6319bbf 100644
--- a/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
+++ b/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
@@ -736,10 +736,12 @@ static int sslCreateAppData(SSL* ssl) {
data->fdsEmergency[1] = -1;
if (pipe(data->fdsEmergency) == -1) {
+ free(data);
return -1;
}
if (MUTEX_SETUP(data->mutex) == -1) {
+ free(data);
return -1;
}