Check boundary prior to dereferencing.

diff --git a/src/libserver/url.c b/src/libserver/url.c
index e43ff37241587e48b1440161103d55627328f1be..a3dbf92f4b6b254aabe04adba2d59d21d31ca7c5 100644 (file)
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -1742,8 +1742,8 @@ url_email_end (const gchar *begin,
 
        /* Strip strange symbols at the end */
        if (got_at) {
-               while ((!is_domain (*p) || *p == '.' || *p == '_') &&
-                               p >= match->m_begin) {
+               while (p >= match->m_begin &&
+                               (!is_domain (*p) || *p == '.' || *p == '_')) {
                        p --;
                }
                p ++;