head	1.3;
access;
symbols
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE:1.3.0.4
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_SOLID:1.3.0.2
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_3_SOLID:1.2.0.2
	OPENPKG_2_4_RELEASE:1.1
	OPENPKG_2_4_SOLID:1.1.0.2
	OPENPKG_2_4_SOLID_BP:1.1
	OPENPKG_CW_FP:1.1;
locks; strict;
comment	@# @;


1.3
date	2005.10.03.08.22.34;	author rse;	state dead;
branches;
next	1.2;

1.2
date	2005.09.05.14.35.14;	author rse;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.03.08.09.14.17;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.2.2.1
date	2005.09.05.14.37.19;	author rse;	state Exp;
branches;
next	;

1.1.2.1
date	2005.09.05.14.36.04;	author rse;	state Exp;
branches;
next	;


desc
@@


1.3
log
@upgrading package: l2 0.9.10 -> 0.9.11
@
text
@Index: l2_ut_sa.c
--- l2_ut_sa.c.orig	2005-02-02 11:40:33 +0100
+++ l2_ut_sa.c	2005-03-08 10:13:30 +0100
@@@@ -653,7 +653,7 @@@@
             sf = AF_INET6;
         }
 #endif
-        else if ((he = SA_SC_CALL_1(sa, gethostbyname, cpHost)) != NULL) {
+        else if ((he = gethostbyname(cpHost)) != NULL) {
             if (he->h_addrtype == AF_INET) {
                 sa4.sin_family = AF_INET;
                 sa4.sin_port = htons(nPort);

-----------------------------------------------------------------------------

Security Fix (CAN-2005-2491, partially only)

Index: l2_ut_pcre.c
--- l2_ut_pcre.c.orig	2003-01-28 10:10:39 +0100
+++ l2_ut_pcre.c	2005-09-05 16:22:43 +0200
@@@@ -674,6 +674,10 @@@@
 
 	while ((cd->ctypes[*p] & ctype_digit) != 0)
 		min = min * 10 + *p++ - '0';
+	if (min < 0 || min > 65535) {
+	    *errorptr = ERR5;
+	    return p;
+	}
 
 	if (*p == '}')
 		max = min;
@@@@ -682,6 +686,10 @@@@
 			max = 0;
 			while ((cd->ctypes[*p] & ctype_digit) != 0)
 				max = max * 10 + *p++ - '0';
+			if (max < 0 || max > 65535) {
+			    *errorptr = ERR5;
+			    return p;
+			}
 			if (max < min) {
 				*errorptr = ERR4;
 				return p;
@


1.2
log
@apply Security Fix (CAN-2005-2491)
@
text
@@


1.2.2.1
log
@apply Security Fix (CAN-2005-2491)
@
text
@@


1.1
log
@fix building on non-IPv6 platforms (where getaddrinfo() does not exist and hence gethostbyname() is used)
@
text
@d13 30
@


1.1.2.1
log
@apply Security Fix (CAN-2005-2491)
@
text
@a12 30

-----------------------------------------------------------------------------

Security Fix (CAN-2005-2491, partially only)

Index: l2_ut_pcre.c
--- l2_ut_pcre.c.orig	2003-01-28 10:10:39 +0100
+++ l2_ut_pcre.c	2005-09-05 16:22:43 +0200
@@@@ -674,6 +674,10 @@@@
 
 	while ((cd->ctypes[*p] & ctype_digit) != 0)
 		min = min * 10 + *p++ - '0';
+	if (min < 0 || min > 65535) {
+	    *errorptr = ERR5;
+	    return p;
+	}
 
 	if (*p == '}')
 		max = min;
@@@@ -682,6 +686,10 @@@@
 			max = 0;
 			while ((cd->ctypes[*p] & ctype_digit) != 0)
 				max = max * 10 + *p++ - '0';
+			if (max < 0 || max > 65535) {
+			    *errorptr = ERR5;
+			    return p;
+			}
 			if (max < min) {
 				*errorptr = ERR4;
 				return p;
@