From a50aa0fb95c343e95cb115140a137e4019d899ea Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 2 May 2018 07:16:55 +0200 Subject: [PATCH] Fix null pointer for KeyDerivationName --- .../java/com/kunzisoft/keepass/database/PwDatabaseV4.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java index 0175e2a0e..504165f36 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java +++ b/app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java @@ -332,7 +332,10 @@ public class PwDatabaseV4 extends PwDatabase { @Override public String getKeyDerivationName() { - return kdfEngine.getName(); + if (kdfEngine!=null) + return kdfEngine.getName(); + else + return ""; } @Override