Merge pull request #46 from zfi/master

Null email address causes Null Pointer exception
parallaxinc · Mar 1, 2018 · 317558d · 317558d
2 parents 5fe8a17 + 22a7668
commit 317558d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/Email/services.py b/app/Email/services.py
@@ -211,7 +211,8 @@ def _convert_email_uri(email):
     to create a URI that contains an email address that, when submitted to a
     server, will not be replaced with a space character.
     """
-    if "+" in email:
-        return email.replace("+", "%2B")
-    else:
-        return email
+    if email is not None:
+        if "+" in email:
+            return email.replace("+", "%2B")
+
+    return email
diff --git a/app/__init__.py b/app/__init__.py
@@ -24,11 +24,14 @@
 app = Flask(__name__)
 
 # Application version (major,minor,patch-level)
-version = "1.1.4"
+version = "1.1.5"
 
 """
 Change Log
 
+1.1.5       Refactor _convert_email_uri(email) to properly handle a null
+            email address.
+
 1.1.4       Add code to convert plus signs located the the username portion
             of an email address to a '%2B'when the email address is embedded
             in a URL.