Fix StringIndexOutOfBoundsException parsing host name from email

wocommunity · Feb 14, 2013 · 0eec660 · 0eec660
1 parent ecfa4cf
commit 0eec660
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/net/ERXEmailValidator.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/net/ERXEmailValidator.java
@@ -283,6 +283,7 @@ public static String hostNameForEmailString(String email) {
 		String hostName = StringUtils.substringAfterLast(email, "@");
 		// handle domain literals and quoted identifiers
 		hostName = StringUtils.trimToEmpty(hostName);
+		if(hostName.isEmpty()) { return hostName; }
 		int lastIndex = hostName.length() - 1;
 		if (hostName.lastIndexOf('>') == lastIndex) {
 			hostName = hostName.substring(0, lastIndex);

diff --git a/Tests/ERXTest/Sources/er/extensions/net/ERXEmailValidatorTest.java b/Tests/ERXTest/Sources/er/extensions/net/ERXEmailValidatorTest.java
@@ -41,5 +41,6 @@ public void testHostNameForEmailString() {
 		Assert.assertEquals("gmail.com", ERXEmailValidator.hostNameForEmailString("[email protected]"));
 		Assert.assertEquals("74.125.224.182", ERXEmailValidator.hostNameForEmailString("tom@[74.125.224.182]"));
 		Assert.assertEquals("74.125.224.182", ERXEmailValidator.hostNameForEmailString("\"Thomas Thomson\" < tom@[	74.125.224.182 ]>"));
+		Assert.assertEquals("", ERXEmailValidator.hostNameForEmailString("thomas"));
 	}
 }