From 6b6a343822732845953729656820042966f0b78c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 24 Jun 2014 01:36:49 +0200
Subject: [PATCH] Fixed an NPE in PasswordStrength checker

---
 src/org/cacert/gigi/util/PasswordStrengthChecker.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/cacert/gigi/util/PasswordStrengthChecker.java b/src/org/cacert/gigi/util/PasswordStrengthChecker.java
index 0f72664e..efc776ef 100644
--- a/src/org/cacert/gigi/util/PasswordStrengthChecker.java
+++ b/src/org/cacert/gigi/util/PasswordStrengthChecker.java
@@ -12,7 +12,7 @@ public class PasswordStrengthChecker {
 	static Pattern special = Pattern.compile("\\W");
 	private PasswordStrengthChecker() {
 	}
-	public static int checkpwlight(String pw) {
+	private static int checkpwlight(String pw) {
 		int points = 0;
 		if (pw.length() > 15) {
 			points++;
@@ -44,6 +44,9 @@ public class PasswordStrengthChecker {
 		return points;
 	}
 	public static int checkpw(String pw, User u) {
+		if (pw == null) {
+			return 0;
+		}
 		int light = checkpwlight(pw);
 		if (contained(pw, u.getEmail())) {
 			light -= 2;
-- 
2.39.2