head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.40
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.38
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.36
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.34
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.32
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.30
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.28
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.26
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.24
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.22
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.20
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.18
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.16
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.14
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.12
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.10
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.8
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.6
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.4
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.2
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.1.0.4
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2005.08.05.16.29.55;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2005.05.28.14.15.23;	author adrianp;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2005.05.28.14.15.23;	author salo;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2005.05.28.22.24.59;	author salo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 0.9.3
changes:
Option to chroot() when dropping privs
Fixes for compiling on nearly every platform,
	including improved 64bit support
Many new testcases
Support for sending packets
Improved Unicode support
Decoders & DLT Changes, Updates and New
@
text
@$NetBSD: patch-ad,v 1.1 2005/05/28 14:15:23 adrianp Exp $

--- print-isoclns.c.orig	2005-05-06 09:11:15.000000000 +0100
+++ print-isoclns.c
@@@@ -1506,6 +1506,9 @@@@ static int isis_print (const u_int8_t *p
                tlv_type,
                tlv_len);
 
+	if (tlv_len == 0) /* something is malformed */
+		break;
+
         /* now check if we have a decoder otherwise do a hexdump at the end*/
 	switch (tlv_type) {
 	case TLV_AREA_ADDR:
@@@@ -1536,7 +1539,7 @@@@ static int isis_print (const u_int8_t *p
 	    break;
 
         case TLV_ISNEIGH_VARLEN:
-            if (!TTEST2(*tptr, 1))
+            if (!TTEST2(*tptr, 1) || tmp < 3) /* min. TLV length */
 		goto trunctlv;
 	    lan_alen = *tptr++; /* LAN adress length */
             tmp --;
@


1.1
log
@- Update to nb1 for security issues
- Patches from tcpdump.org CVS tree
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-ad was added on branch pkgsrc-2005Q1 on 2005-05-28 14:15:23 +0000
@
text
@d1 23
@


1.1.2.2
log
@Pullup ticket 521 - requested by Adrian Portelli
security fix for tcpdump

Revisions pulled up:
- pkgsrc/net/tcpdump/Makefile		1.15
- pkgsrc/net/tcpdump/distinfo		1.8
- pkgsrc/net/tcpdump/patches/patch-ac	1.1
- pkgsrc/net/tcpdump/patches/patch-ad	1.1
- pkgsrc/net/tcpdump/patches/patch-ae	1.1
- pkgsrc/net/tcpdump/patches/patch-af	1.1

   Module Name:		pkgsrc
   Committed By:	adrianp
   Date:		Sat May 28 14:15:23 UTC 2005

   Modified Files:
   	pkgsrc/net/tcpdump: Makefile distinfo
   Added Files:
   	pkgsrc/net/tcpdump/patches: patch-ac patch-ad patch-ae patch-af

   Log Message:
   - Update to nb1 for security issues
   - Patches from tcpdump.org CVS tree
@
text
@a0 23
$NetBSD: patch-ad,v 1.1.2.1 2005/05/28 22:24:59 salo Exp $

--- print-isoclns.c.orig	2005-05-06 09:11:15.000000000 +0100
+++ print-isoclns.c
@@@@ -1506,6 +1506,9 @@@@ static int isis_print (const u_int8_t *p
                tlv_type,
                tlv_len);
 
+	if (tlv_len == 0) /* something is malformed */
+		break;
+
         /* now check if we have a decoder otherwise do a hexdump at the end*/
 	switch (tlv_type) {
 	case TLV_AREA_ADDR:
@@@@ -1536,7 +1539,7 @@@@ static int isis_print (const u_int8_t *p
 	    break;
 
         case TLV_ISNEIGH_VARLEN:
-            if (!TTEST2(*tptr, 1))
+            if (!TTEST2(*tptr, 1) || tmp < 3) /* min. TLV length */
 		goto trunctlv;
 	    lan_alen = *tptr++; /* LAN adress length */
             tmp --;
@