Commit upstream/2.8.8dev.5 - lynx

+9

-1

CHANGES less more

0		-- $LynxId: CHANGES,v 1.491 2010/06/21 08:36:29 tom Exp $
	0	-- $LynxId: CHANGES,v 1.496 2010/08/25 09:20:04 tom Exp $
1	1	===============================================================================
2	2	Changes since Lynx 2.8 release
3	3	===============================================================================
	4
	5	2010-08-25 (2.8.8dev.5)
	6	* modify convert_to_idna() to check for malformed urls (Debian #594300 reports
	7	this as CVE-2010-2810) -TD
	8	* correct typo in po/makefile.inn from removal of mkdirs.sh in dev.4 (Debian
	9	#592078) -TD
	10	* correct a sign-extension error in UpdateBoundary(), used for MIME boundary
	11	computation, broken in dev.4 compiler-warning fixes -TD
4	12
5	13	2010-06-21 (2.8.8dev.4)
6	14	* check for SSL error when reading response from "GET". This incidentally

+1

-1

PACKAGE/version.iss less more

0	0	; version used for Inno Setup files.
1	1
2	2	; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
3		#define LYNX_VERSION "2.8.8dev.4"
	3	#define LYNX_VERSION "2.8.8dev.5"
4	4
5	5	#define MyAppName "Lynx"
6	6	#define MyAppPublisher "Thomas E Dickey"

+31

-14

WWW/Library/Implementation/HTParse.c less more

0	0	/*
1		* $LynxId: HTParse.c,v 1.59 2010/06/20 23:02:58 tom Exp $
	1	* $LynxId: HTParse.c,v 1.60 2010/08/25 09:17:08 tom Exp $
2	2	*
3	3	* Parse HyperText Document Address HTParse.c
4	4	* ================================

243	243	#ifdef USE_IDNA
244	244	static int hex_decode(int ch)
245	245	{
246		int result = 0;
	246	int result = -1;
247	247
248	248	if (ch >= '0' && ch <= '9')
249	249	result = (ch - '0');

260	260	*/
261	261	static void convert_to_idna(char *host)
262	262	{
263		char *buffer = malloc(strlen(host) + 1);
	263	size_t length = strlen(host);
	264	char *endhost = host + length;
	265	char *buffer = malloc(length + 1);
264	266	char *output = NULL;
265	267	char src, dst;
266	268	int code;
	269	int hi, lo;
267	270
268	271	if (buffer != 0) {
269		for (dst = buffer, src = host; *src != '\0'; ++dst) {
	272	code = TRUE;
	273	for (dst = buffer, src = host; src < endhost; ++dst) {
270	274	int ch = *src++;
271	275
272	276	if (ch == HEX_ESCAPE) {
273		int hi = hex_decode(*src++);
274		int lo = hex_decode(*src++);
275
276		*dst = (char) ((hi << 4) \| lo);
	277	if ((src + 1) < endhost
	278	&& (hi = hex_decode(src[0])) >= 0
	279	&& (lo = hex_decode(src[1])) >= 0) {
	280
	281	*dst = (char) ((hi << 4) \| lo);
	282	src += 2;
	283	} else {
	284	CTRACE((tfp, "convert_to_idna: `%s' is malformed\n", host));
	285	code = FALSE;
	286	break;
	287	}
277	288	} else {
278	289	*dst = (char) ch;
279	290	}
280	291	}
281		*dst = '\0';
282		code = idna_to_ascii_8z(buffer, &output, IDNA_USE_STD3_ASCII_RULES);
283		if (code == IDNA_SUCCESS) {
284		strcpy(host, output);
285		}
286		FREE(output);
	292	if (code) {
	293	*dst = '\0';
	294	code = idna_to_ascii_8z(buffer, &output, IDNA_USE_STD3_ASCII_RULES);
	295	if (code == IDNA_SUCCESS) {
	296	strcpy(host, output);
	297	} else {
	298	CTRACE((tfp, "convert_to_idna: `%s': %s\n",
	299	buffer,
	300	idna_strerror(code)));
	301	}
	302	FREE(output);
	303	}
287	304	free(buffer);
288	305	}
289	306	}

+1

-1

configure less more

1241	1241
1242	1242	PACKAGE=lynx
1243	1243	# $Format: "VERSION=$ProjectVersion$"$
1244		VERSION=2.8.8dev.4
	1244	VERSION=2.8.8dev.5
1245	1245
1246	1246	echo "$as_me:1247: checking for DESTDIR" >&5
1247	1247	echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6

+2

-2

configure.in less more

28	28	dnl
29	29	dnl ask PRCS to plug-in the project-version for the configure-script.
30	30	dnl $Format: "AC_REVISION($ProjectVersion$)"$
31		AC_REVISION(2.8.8dev.4)
	31	AC_REVISION(2.8.8dev.5)
32	32
33	33	# Save the original $CFLAGS so we can distinguish whether the user set those
34	34	# in the environment, or whether autoconf added -O and -g options:

61	61	PACKAGE=lynx
62	62	dnl ask PRCS to plug-in the project-version for the packages.
63	63	# $Format: "VERSION=$ProjectVersion$"$
64		VERSION=2.8.8dev.4
	64	VERSION=2.8.8dev.5
65	65
66	66	AC_SUBST(PACKAGE)
67	67	AC_SUBST(VERSION)

+2

-2

lynx.cfg less more

3	3	# or Lynx_Dir:lynx.cfg (VMS)
4	4	#
5	5	# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
6		#PRCS LYNX_VERSION "2.8.8dev.4"
	6	#PRCS LYNX_VERSION "2.8.8dev.5"
7	7	#
8	8	# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
9		#PRCS LYNX_DATE "Mon, 21 Jun 2010 02:44:55 -0700"
	9	#PRCS LYNX_DATE "Wed, 25 Aug 2010 02:40:13 -0700"
10	10	#
11	11	# Definition pairs are of the form VARIABLE:DEFINITION
12	12	# NO spaces are allowed between the pair items.

+2

-2

po/makefile.inn less more

0		# $LynxId: makefile.inn,v 1.17 2010/06/19 10:57:02 tom Exp $
	0	# $LynxId: makefile.inn,v 1.18 2010/08/08 14:07:45 tom Exp $
1	1	#
2	2	# Makefile for program source directory in GNU NLS utilities package.
3	3	# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>

122	122	install-data: install-data-@USE_NLS@
123	123	install-data-no: all
124	124	install-data-yes: all
125		mkdir -p $(DATADIR); \
	125	mkdir -p $(DATADIR)
126	126	@catalogs='$(CATALOGS)'; \
127	127	for cat in $$catalogs; do \
128	128	cat=`basename $$cat`; \

+6

-6

src/GridText.c less more

0	0	/*
1		* $LynxId: GridText.c,v 1.188 2010/06/17 10:50:36 tom Exp $
	1	* $LynxId: GridText.c,v 1.190 2010/06/29 00:56:31 tom Exp $
2	2	*
3	3	* Character grid hypertext object
4	4	* ===============================

1778	1778	}
1779	1779	#endif /* USE_COLOR_STYLE */
1780	1780	#ifdef WIDEC_CURSES
1781		i = limit - LYbarWidth - strlen(percent) - LYstrCells(title);
	1781	i = limit - LYbarWidth - (int) strlen(percent) - LYstrCells(title);
1782	1782	if (i <= 0) { /* title is truncated */
1783		i = limit - LYbarWidth - strlen(percent) - 3;
	1783	i = limit - LYbarWidth - (int) strlen(percent) - 3;
1784	1784	if (i <= 0) { /* no room at all */
1785	1785	title[0] = '\0';
1786	1786	} else {

6006	6006	* LYstrExtent filters out the formatting characters, so we do not
6007	6007	* have to count them here, except for soft newlines.
6008	6008	*/
6009		anchor_ptr->line_pos = LYstrExtent2(line_ptr->data, anchor_col);
	6009	anchor_ptr->line_pos = (short) LYstrExtent2(line_ptr->data, anchor_col);
6010	6010	if (line_ptr->data[0] == LY_SOFT_NEWLINE)
6011		anchor_ptr->line_pos += 1;
	6011	anchor_ptr->line_pos = (short) (anchor_ptr->line_pos + 1);
6012	6012	}
6013	6013	#else /* 8-bit curses, etc. */
6014	6014	if (anchor_ptr->line_pos > 0) {

10631	10631	assert(want != NULL);
10632	10632	assert(text != NULL);
10633	10633
10634		for (j = 0; j <= (last - have); ++j) {
	10634	for (j = 0; (long) j <= (long) (last - have); ++j) {
10635	10635	if (want[0] == text[j]
10636	10636	&& !memcmp(want, text + j, have)) {
10637	10637	char temp[2];

+2

-2

userdefs.h less more

1431	1431	* the version definition with the Project Version on checkout. Just
1432	1432	* ignore it. - kw */
1433	1433	/* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
1434		#define LYNX_VERSION "2.8.8dev.4"
	1434	#define LYNX_VERSION "2.8.8dev.5"
1435	1435	#define LYNX_WWW_HOME "http://lynx.isc.org/"
1436	1436	#define LYNX_WWW_DIST "http://lynx.isc.org/current/"
1437	1437	/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
1438		#define LYNX_DATE "Mon, 21 Jun 2010 02:44:55 -0700"
	1438	#define LYNX_DATE "Wed, 25 Aug 2010 02:40:13 -0700"
1439	1439	#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
1440	1440	#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
1441	1441