Changeset aba0927 in github

Timestamp:

Mar 3, 2010 7:12:31 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

b975da2

Parents:

7910c0f

Message:

• Fix long e-mail addresses validation (#1486453)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix long e-mail addresses validation (#1486453)
 - Remember search modifiers in user prefs (#1486146)
 - Added force_7bit option to force MIME encoding of plain/text messages (#1486510)

program/include/main.inc

@@ -1512 +1512 @@
     return false;
 
-  // Check that there's one @ symbol, and that the lengths are right
-  if (!preg_match('/^([^@]{1,64})@([^@]{1,255})$/', $email, $email_array))
+  // Check for length limit specified by RFC 5321 (#1486453)
+  if (strlen($email) > 254) 
+    return false;
+
+  // Check that there's one @ symbol
+  if (!preg_match('/^([^@]+)@([^@]+)$/', $email, $email_array))
     return false;