snapshot of project "lynx", label v2-9-0dev_2b

5 files changed, 38 insertions, 17 deletions

diff --git a/CHANGES b/CHANGES
index 98bab619..eb953dbf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
--- $LynxId: CHANGES,v 1.1015 2019/08/17 00:50:32 tom Exp $
+-- $LynxId: CHANGES,v 1.1017 2019/08/22 08:49:25 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2019-08-16 (2.9.0dev.3)
+2019-08-22 (2.9.0dev.3)
+* modify lynx.iss to use statically-linked bzip2 and gzip programs, and to
+  eliminate a spurious warning when attempting to remove an optional DLL -TD
+* fix a few coverity warnings -TD
 * revise HTSimplify to eliminate a redundant "." segment at the beginning of a
   path, referring to RFC 3986 5.2.4 (report by Alejandro Lieber) -TD
 
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index 68d9b83c..6172363c 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.32 2019/01/27 22:56:58 tom Exp $

+; $LynxId: lynx.iss,v 1.33 2019/08/22 00:27:18 tom Exp $

 ; vile:ts=4 sw=4 notabinsert fk=8bit

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -138,8 +138,6 @@ Name: "{app}\icon"
 #ifndef NoScreenDll

 #emit 'Source: "' + DllsSrcDir + '\' + ScreenDllName + '"; DestDir: "{app}"; DestName: ' + ScreenDllName + '; Flags: ignoreversion'

 #endif

-#emit 'Source: "' + DllsSrcDir + '\' + ZlibDllName + '"; DestDir: "{app}"; DestName: ' + ZlibDllName + '; Flags: ignoreversion'

-#emit 'Source: "' + DllsSrcDir + '\' + BzipDllName + '"; DestDir: "{app}"; DestName: ' + BzipDllName + '; Flags: ignoreversion'

 #emit 'Source: "' + DllsSrcDir + '\' + BzipExeName + '"; DestDir: "{app}"; DestName: ' + BzipExeName + '; Flags: ignoreversion'

 #emit 'Source: "' + DllsSrcDir + '\' + GzipExeName + '"; DestDir: "{app}"; DestName: ' + GzipExeName + '; Flags: ignoreversion'

 #emit 'Source: "' + DocsSrcDir + '\*.*"; DestDir: "{app}\doc"; Flags: '

@@ -442,11 +440,14 @@ end;
 

 procedure ReallyDelete(const fullPath: string);

 begin

-    if DeleteFile( fullPath ) then

-        Log( '...successful' )

-    else

+    if FileExists( fullpath ) then

         begin

-        MsgBox('Failed to delete ' + fullPath, mbError, MB_OK);

+        if DeleteFile( fullPath ) then

+            Log( '...successful' )

+        else

+            begin

+            MsgBox('Failed to delete ' + fullPath, mbError, MB_OK);

+            end;

         end;

 end;

 

diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index 75b7001e..3cd1b791 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTNews.c,v 1.73 2018/02/26 00:28:40 tom Exp $
+ * $LynxId: HTNews.c,v 1.74 2019/08/20 09:03:18 tom Exp $
  *
  *			NEWS ACCESS				HTNews.c
  *			===========
@@ -56,9 +56,19 @@ static SSL *Handle = NULL;
 static int channel_s = 1;
 
 #define NEWS_NETWRITE(sock, buff, size) \
-	(Handle ? SSL_write(Handle, buff, size) : NETWRITE(sock, buff, size))
+	((Handle != NULL) \
+	 ? SSL_write(Handle, buff, size) \
+	 : NETWRITE(sock, buff, size))
 #define NEWS_NETCLOSE(sock) \
-	{ (void)NETCLOSE(sock); if (Handle) { SSL_free(Handle); Handle = NULL; } }
+	{ \
+	    if ((int)(sock) >= 0) { \
+	        (void)NETCLOSE(sock); \
+	    } \
+	    if (Handle != NULL) { \
+	        SSL_free(Handle); \
+	        Handle = NULL; \
+	    } \
+	}
 static int HTNewsGetCharacter(void);
 
 #define NEXT_CHAR HTNewsGetCharacter()
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index 12c50a08..8e3bb867 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCharUtils.c,v 1.131 2018/03/05 22:32:14 tom Exp $
+ * $LynxId: LYCharUtils.c,v 1.132 2019/08/20 09:22:40 tom Exp $
  *
  *  Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM
  *  ==========================================================================
@@ -1124,6 +1124,12 @@ char **LYUCFullyTranslateString(char **str,
     if (isEmpty(*str))
 	return str;
 
+    if (cs_from < 0 || cs_to < 0) {
+	CTRACE((tfp, "BUG: LYUCFullyTranslateString from=%d, to=%d\n",
+		cs_from, cs_to));
+	return str;
+    }
+
     /*
      * FIXME: something's wrong with the limit checks here (clearing the
      * buffer helps).
diff --git a/src/LYUtils.c b/src/LYUtils.c
index c6c6b06a..0152ec72 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.294 2019/08/16 22:44:10 tom Exp $
+ * $LynxId: LYUtils.c,v 1.296 2019/08/22 09:17:59 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -2967,13 +2967,14 @@ BOOLEAN inlocaldomain(void)
 		    break;
 	    }
 	    if (ulen > strlen(LYLocalDomain) &&
-		STREQ(LYLocalDomain,
-		      me.ut_host + ulen - strlen(LYLocalDomain))) {
+		!memcmp(LYLocalDomain,
+			me.ut_host + ulen - strlen(LYLocalDomain),
+			ulen)) {
 		result = TRUE;
 	    }
 #ifdef LINUX
 	    /* Linux fix to check for local user. J.Cullen 11Jul94              */
-	    else if (strlen(me.ut_host) == 0) {
+	    else if (ulen == 0) {
 		result = TRUE;
 	    }
 #endif /* LINUX */