Changeset 1781 for trunk/dll/newview.c

Timestamp:

Jun 28, 2014, 11:25:34 PM (11 years ago)

Author:

Gregg Young

Message:

Fix conditional trap caused by changes in CS [1780]

File:

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

trunk/dll/newview.c

@@ -40 +40 @@
   13 Jul 09 SHL Sync with renames
   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 >
 
 ***********************************************************************/
@@ -2435 +2436 @@
 
           CHAR *e;
-          CHAR szUrlString[SEARCHSTRINGLEN];
 
           width = (Rectl.xRight - Rectl.xLeft) / ad->fattrs.lAveCharWidth;
@@ -2450 +2450 @@
             goto NoAdd;
 
-          strcpy(szUrlString,ad->lines[whichline]);
           if ((ad->httpin && (*httprun || fHttpRunWPSDefault) &&
-               strnstr(szUrlString, "http://", width)) ||
+               strnstr(ad->lines[whichline], "http://", width)) ||
               (ad->ftpin && (*ftprun || fFtpRunWPSDefault) &&
-               strnstr(szUrlString, "ftp://", width)) ||
-              (ad->mailin && *mailrun && mailstr(szUrlString, "@", width))) {
+               strnstr(ad->lines[whichline], "ftp://", width)) ||
+              (ad->mailin && *mailrun && strchr(ad->lines[whichline], '@'))) {
 
             USHORT ret;
@@ -2463 +2462 @@
             if (urld) {
               urld->size = sizeof(URLDATA);
-              urld->line = szUrlString;
+              urld->line = ad->lines[whichline];
               urld->len = width;
               ret = (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, UrlDlgProc,