Changeset 1790 for trunk/dll/newview.c

Timestamp:

Aug 31, 2014, 8:11:13 PM (11 years ago)

Author:

Gregg Young

Message:

Added isemailaddress to try to eliminate lines being falsely identified as containing an email. Fixed the mailto code to avoid a buffer over run (trap) and to cut trailing punctuation marks from the address. Tickets [543] & [544]

File:

• trunk/dll/newview.c (modified) (11 diffs)

trunk/dll/newview.c

@@ -41 +41 @@
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   28 Jun 14 GKY Fix errors identified with CPPCheck Fix "mailto" failure to drop trailing >
+  30 Aug 14 GKY Added isemailaddress to try to eliminate lines being falsely identified as
+                containing an email. Fixed the mailto code to avoid a buffer over run (trap)
+                and to cut trailing punctuation marks from the address
 
 ***********************************************************************/
@@ -49 +52 @@
 #include <limits.h>
 #include <share.h>
+#include <ctype.h> 
 
 #define INCL_DOS
@@ -199 +203 @@
 //to the first word that contains the character then prepends <mailto: and appends >
 
+BOOL isemailaddress(PSZ pszLine)
+{
+  CHAR *tmp;
+  CHAR *p, *pp;
+
+  tmp = xmallocz(strlen(pszLine) + 1, pszSrcFile, __LINE__);
+  if (!tmp)
+    return FALSE;
+  memcpy(tmp, pszLine, strlen(pszLine));
+  tmp[strlen(pszLine) + 1] = 0;
+  bstripcr(tmp);
+  p = tmp;
+  p++;
+  p = strchr(p, '@');
+  if (!p) {
+    free(tmp);
+    return FALSE;
+  }
+  pp = strchr(p, '.');
+  if (!pp || pp - p < 2) {
+    free(tmp);
+    return FALSE;
+  }
+  p++;
+  for (p ; p < pp; p++) {
+    if (isalnum(*p) || *p == '-')
+      continue;
+    else if (*p == '{') {
+      if (!strchr(p ,'}') || pp - p > 4) {
+        free(tmp);
+        return FALSE;
+      }
+    }
+    else  {
+      free(tmp);
+      return FALSE;
+    }
+
+  }
+  free(tmp);
+  return TRUE;
+}
+
 PSZ mailstr(CHAR *pszSrc, CHAR *pszFindChar, LONG StrLens)
 {
@@ -240 +287 @@
   *pszCharCounter = 0;
   if (!stristr(pszSrc, "<mailto:") && !fNoMailtoMailRun) {
-    strip_lead_char("<", pszSrc);
-    strip_trail_char(">", pszSrc);
+    strip_lead_char("'<", pszSrc);
+    strip_trail_char(",.;:'>", pszSrc);
     strcat(szMailTo, pszSrc);
     //strcat(szMailTo, szMailEnd);
@@ -248 +295 @@
     }
   else {
-    strip_lead_char("<", pszSrc);
-    strip_trail_char(">", pszSrc);
+    strip_lead_char("'<", pszSrc);
+    strip_trail_char(",.;':>", pszSrc);
     return pszSrc;
   }
@@ -263 +310 @@
       CHAR *p, *e, *pp;
       SHORT count;
-      CHAR szUrlString[SEARCHSTRINGLEN];
+      CHAR szUrlString[SEARCHSTRINGLEN] = {0};
 
       WinSetWindowPtr(hwnd, QWL_USER, mp2);
@@ -303 +350 @@
       while (p && *p && p < e);
       p = urld->line;
-      if (strchr(p, '@')) {
-        strcpy(szUrlString, urld->line);
+      if (isemailaddress(p)) {
+        memcpy(szUrlString, urld->line, SEARCHSTRINGLEN - 1);
         mailstr(szUrlString, "@", e - p);
-        strcpy(urld->url, szUrlString);
+        memcpy(urld->url, szUrlString, strlen( szUrlString) + 1);
+        urld->url[strlen(szUrlString) + 1] = 0;
         if (pp = strchr(urld->url, '>'))
           *pp = 0;
@@ -376 +424 @@
                 }
               }
-              else if (strchr(urld->url, '@')) {
+              else if (isemailaddress(urld->url)) {
                   WinDismissDlg(hwnd, 3);
                   break;
@@ -1395 +1443 @@
                   strstr(ad->text, "http://"))
                 ad->httpin = TRUE;
-              if (*mailrun && !ad->ignoremail && strstr(ad->text, "@"))
+              if (*mailrun && !ad->ignoremail && isemailaddress(ad->text))
                 ad->mailin = TRUE;
             }
@@ -2454 +2502 @@
               (ad->ftpin && (*ftprun || fFtpRunWPSDefault) &&
                strnstr(ad->lines[whichline], "ftp://", width)) ||
-              (ad->mailin && *mailrun && strchr(ad->lines[whichline], '@'))) {
+              (ad->mailin && *mailrun && isemailaddress(ad->lines[whichline]))) {
 
             USHORT ret;
@@ -3384 +3432 @@
       ad->mailin = FALSE;
       if (ad->text && *mailrun && !ad->ignoremail &&
-          strstr(ad->text, "@"))
+          isemailaddress(ad->text))
         ad->mailin = TRUE;
       IgnoreMail = ad->ignoremail;