moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 04:22:18 -05:00
Code Issues Releases Wiki Activity

fix a couple of resource leaks (#1351)

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-06-17 20:26:06 +02:00
parent 300fd8e0f2
commit 5895385153
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
View File

@ -303,10 +303,13 @@ public class ContactHelper {
Cursor contactMasterKey = context.getContentResolver().query(contactUri, Cursor contactMasterKey = context.getContentResolver().query(contactUri,
new String[]{ContactsContract.Data.DATA2}, null, null, null); new String[]{ContactsContract.Data.DATA2}, null, null, null);
if (contactMasterKey != null) { if (contactMasterKey != null) {
if (contactMasterKey.moveToNext()) { try {
return KeychainContract.KeyRings.buildGenericKeyRingUri(contactMasterKey.getLong(0)); if (contactMasterKey.moveToNext()) {
return KeychainContract.KeyRings.buildGenericKeyRingUri(contactMasterKey.getLong(0));
}
} finally {
contactMasterKey.close();
} }
contactMasterKey.close();
} }
return null; return null;
} }
@ -537,7 +540,7 @@ public class ContactHelper {
KEYS_TO_CONTACT_PROJECTION, KEYS_TO_CONTACT_PROJECTION,
KeychainContract.KeyRings.HAS_ANY_SECRET + "!=0", KeychainContract.KeyRings.HAS_ANY_SECRET + "!=0",
null, null); null, null);
if (cursor != null) { if (cursor != null) try {
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
long masterKeyId = cursor.getLong(INDEX_MASTER_KEY_ID); long masterKeyId = cursor.getLong(INDEX_MASTER_KEY_ID);
boolean isExpired = cursor.getInt(INDEX_IS_EXPIRED) != 0; boolean isExpired = cursor.getInt(INDEX_IS_EXPIRED) != 0;
@ -565,6 +568,8 @@ public class ContactHelper {
} }
} }
} }
} finally {
cursor.close();
} }
for (long masterKeyId : keysToDelete) { for (long masterKeyId : keysToDelete) {

23
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableFileCache.java
View File

@ -66,21 +66,24 @@ public class ParcelableFileCache<E extends Parcelable> {
File tempFile = new File(mContext.getCacheDir(), mFilename); File tempFile = new File(mContext.getCacheDir(), mFilename);
DataOutputStream oos = new DataOutputStream(new FileOutputStream(tempFile)); DataOutputStream oos = new DataOutputStream(new FileOutputStream(tempFile));
oos.writeInt(numEntries); try {
oos.writeInt(numEntries);
while (it.hasNext()) { while (it.hasNext()) {
Parcel p = Parcel.obtain(); // creating empty parcel object Parcel p = Parcel.obtain(); // creating empty parcel object
p.writeParcelable(it.next(), 0); // saving bundle as parcel p.writeParcelable(it.next(), 0); // saving bundle as parcel
byte[] buf = p.marshall(); byte[] buf = p.marshall();
oos.writeInt(buf.length); oos.writeInt(buf.length);
oos.write(buf); oos.write(buf);
p.recycle(); p.recycle();
}
} finally {
oos.close();
} }
oos.close();
} }
/** /**