From d06a6e25cbab30bd89760b931bd7722004cf02b5 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 26 Apr 2016 17:50:28 +0100
Subject: [PATCH] Check that result of File#listFiles() is not null.
---
briar-android/src/org/briarproject/android/AppModule.java | 4 +++-
briar-tests/src/org/briarproject/TestDatabaseConfig.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/AppModule.java b/briar-android/src/org/briarproject/android/AppModule.java
index 0b5b031b92..68d37071af 100644
--- a/briar-android/src/org/briarproject/android/AppModule.java
+++ b/briar-android/src/org/briarproject/android/AppModule.java
@@ -76,7 +76,9 @@ public class AppModule {
private volatile SecretKey key = null;
public boolean databaseExists() {
- return dir.isDirectory() && dir.listFiles().length > 0;
+ if (!dir.isDirectory()) return false;
+ File[] files = dir.listFiles();
+ return files != null && files.length > 0;
}
public File getDatabaseDirectory() {
diff --git a/briar-tests/src/org/briarproject/TestDatabaseConfig.java b/briar-tests/src/org/briarproject/TestDatabaseConfig.java
index e4efc42047..4066b149e2 100644
--- a/briar-tests/src/org/briarproject/TestDatabaseConfig.java
+++ b/briar-tests/src/org/briarproject/TestDatabaseConfig.java
@@ -17,7 +17,9 @@ public class TestDatabaseConfig implements DatabaseConfig {
}
public boolean databaseExists() {
- return dir.isDirectory() && dir.listFiles().length > 0;
+ if (!dir.isDirectory()) return false;
+ File[] files = dir.listFiles();
+ return files != null && files.length > 0;
}
public File getDatabaseDirectory() {
--
GitLab