diff options
| author | Kenny Root <kroot@google.com> | 2010-03-24 19:40:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-24 19:40:12 -0700 |
| commit | 12d12e90a8692a9115e173eb2624986bac36d876 (patch) | |
| tree | 52654c67b1ed74e597030147810214103c73fd4a /x-net | |
| parent | f41dba3320430262e703e40ae7fd8fdf83938b0f (diff) | |
| parent | 7ff716b7ac5af87920480c83d4111aa9cfcd7214 (diff) | |
| download | libcore-12d12e90a8692a9115e173eb2624986bac36d876.zip libcore-12d12e90a8692a9115e173eb2624986bac36d876.tar.gz libcore-12d12e90a8692a9115e173eb2624986bac36d876.tar.bz2 | |
am f87ab961: Merge "Don\'t leak memory on failed pipe or mutex init"
Merge commit 'f87ab9616697b8bae08c5e8007cbdd0039a1f8ce' into dalvik-dev
* commit 'f87ab9616697b8bae08c5e8007cbdd0039a1f8ce':
Don't leak memory on failed pipe or mutex init
Diffstat (limited to 'x-net')
| -rw-r--r-- | x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp | 2 |
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 3075898..086f858 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; } |