about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ABOUT-NLS7
-rw-r--r--CHANGES5
-rw-r--r--COPYHEADER8
-rw-r--r--PACKAGE/debian/copyright12
-rw-r--r--po/makefile.inn8
-rw-r--r--src/LYCookie.c7
-rw-r--r--src/UCdomap.c9
7 files changed, 33 insertions, 23 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 92e0eef8..36bc78d5 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -270,9 +270,10 @@ Using `gettext' in new packages
 
    If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course the GNU Public License applies to your sources from
-then if you include `gettext' directly in your distribution on but
-since you are writing free software anyway this is no restriction.
+package.  Of course the GNU General Public License applies to your
+sources from then if you include `gettext' directly in your distribution
+on but since you are writing free software anyway this is no
+restriction.
 
    Once the sources are change appropriately and the setup can handle to
 use of `gettext' the only thing missing are the translations.  The Free
diff --git a/CHANGES b/CHANGES
index cbc56437..96dd9068 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
--- $LynxId: CHANGES,v 1.807 2015/09/29 09:23:14 tom Exp $
+-- $LynxId: CHANGES,v 1.810 2015/10/02 11:25:01 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
@@ -9,6 +9,9 @@ Changes since Lynx 2.8 release
   to
     http://lynx.invisible-island.net
   because ISC is ending support -TD
+* change "GNU Public License" to "GNU General Public License" for consistency
+  (report by Axel Beckert) -TD
+* free a use-after-free in scan_cookie_sublist (Redhat #1120925) -TG
 * updates for configure macros from ncurses and xterm -TD
 * fix for gnutls logic to support rehandshake on negotiation for optional
   client certificate, e.g., for https://contributors.debian.org (patch by
diff --git a/COPYHEADER b/COPYHEADER
index 063aaf69..1695fb60 100644
--- a/COPYHEADER
+++ b/COPYHEADER
@@ -6,9 +6,9 @@ override the guidelines given in the COPYING file.
 
 Most of the content of the Lynx release (and corresponding copyright) is
 the work of developers on the lynx-dev mailing list, who have agreed to
-distribute their work under the terms and conditions of the GNU Public
-License (Version 2).  Note that the License text after the terms and
-conditions is advisory in nature, and contains neither terms nor
+distribute their work under the terms and conditions of the GNU General
+Public License (Version 2).  Note that the License text after the terms
+and conditions is advisory in nature, and contains neither terms nor
 conditions.  You may choose to follow that advice.
 
 The copyright owners and developers for Lynx grant their express
@@ -80,5 +80,5 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 */
 ------------------------------------------------------------------------------
 -- vile:txtmode fc=72 noti
--- $LynxId: COPYHEADER,v 1.12 2015/01/02 12:26:47 tom Exp $
+-- $LynxId: COPYHEADER,v 1.13 2015/10/02 11:12:57 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index bd7e1309..ce0023ad 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -6,9 +6,9 @@ Current maintainer: Thomas Dickey <dickey@invisible-island.net>
 
 Most of the content of the lynx release (and corresponding copyright) is
 the work of developers on the lynx-dev mailing list, who have agreed to
-distribute their work under the terms and conditions of the GNU Public
-License (Version 2).  Note that the License text after the terms and
-conditions is advisory in nature, and contains neither terms nor
+distribute their work under the terms and conditions of the GNU General
+Public License (Version 2).  Note that the License text after the terms
+and conditions is advisory in nature, and contains neither terms nor
 conditions.  You may choose to follow that advice.
 
 Any licensing questions should be directed to the mailing list:
@@ -46,7 +46,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 -------------------------------------------------------------------------------
 
 Files: aclocal.m4
-Licence: other-BSD
+License: other-BSD
 Copyright: 1997-2014,2015 by Thomas E. Dickey
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
@@ -67,7 +67,7 @@ Copyright: 1997-2014,2015 by Thomas E. Dickey
 
 Files: install-sh
 Copyright:  1994 X Consortium
-Licence: other-BSD
+License: other-BSD
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to
     deal in the Software without restriction, including without limitation the
@@ -102,7 +102,7 @@ Licence: other-BSD
 
 Files: debian/*
 Copyright:  2010-2014,2015 Thomas E. Dickey
-Licence: other-BSD
+License: other-BSD
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
     provided that the above copyright notice appear in all copies and that
diff --git a/po/makefile.inn b/po/makefile.inn
index c4c7adf3..55887e17 100644
--- a/po/makefile.inn
+++ b/po/makefile.inn
@@ -1,11 +1,13 @@
-# $LynxId: makefile.inn,v 1.21 2014/12/22 00:09:52 tom Exp $
+# $LynxId: makefile.inn,v 1.22 2015/10/02 11:12:57 tom Exp $
 #
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file may be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
+# be used in projects which are not available under the GNU General
+# Public License but which still want to provide support for the GNU
+# gettext functionality.
+#
 # Please note that the actual code is *not* freely available.
 
 SHELL = /bin/sh
diff --git a/src/LYCookie.c b/src/LYCookie.c
index be801ab5..57434850 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCookie.c,v 1.129 2014/11/29 15:28:10 Mike.Gorse Exp $
+ * $LynxId: LYCookie.c,v 1.131 2015/09/30 22:05:41 tom Exp $
  *
  *			       Lynx Cookie Support		   LYCookie.c
  *			       ===================
@@ -753,10 +753,13 @@ static char *scan_cookie_sublist(char *hostname,
 	 */
 	if ((co->flags & COOKIE_FLAG_EXPIRES_SET) &&
 	    co->expires <= now) {
+	    next = hl->next;
 	    HTList_removeObject(sublist, co);
 	    freeCookie(co);
 	    total_cookies--;
-	    continue;
+	    if (next)
+		continue;
+	    break;
 	}
 
 	/*
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 7a322909..3023bbb7 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCdomap.c,v 1.99 2014/12/10 09:47:34 tom Exp $
+ * $LynxId: UCdomap.c,v 1.101 2015/10/02 11:25:55 tom Exp $
  *
  *  UCdomap.c
  *  =========
@@ -7,9 +7,10 @@
  * This is a Lynx chartrans engine, its external calls are in UCMap.h
  *
  * Derived from code in the Linux kernel console driver.
- * The GNU Public Licence therefore applies, see
- * the file COPYING in the top-level directory
- * which should come with every Lynx distribution.
+ *
+ * The GNU General Public License therefore applies, see the file
+ * COPYING in the top-level directory which should come with every Lynx
+ * distribution.
  *
  *  [ original comment: - KW ]
  *
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-01-06 15:31:20 +0000