Fixed an NPE in PasswordStrength checker

[gigi.git] / src / org / cacert / gigi / util / PasswordStrengthChecker.java

diff --git a/src/org/cacert/gigi/util/PasswordStrengthChecker.java b/src/org/cacert/gigi/util/PasswordStrengthChecker.java
index 373079922cb90f0414920bd153d9a63419073ab6..efc776ef08da4836d2c30701966b87463a38c776 100644 (file)
--- 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;
@@ -64,7 +67,7 @@ public class PasswordStrengthChecker {
                return light;
        }
        private static boolean contained(String pw, String check) {
-               if (check == null) {
+               if (check == null || check.equals("")) {
                        return false;
                }
                if (pw.contains(check)) {