mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-05 01:55:52 +00:00
- Add a patch to fix heap overflow
- Bump PORTREVISION Obtained from: https://github.com/the-tcpdump-group/tcpdump/issues/446 MFH: 2015Q2 Security: CVE-2015-3138
This commit is contained in:
parent
534847e4fb
commit
e136016bf8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=384101
@ -3,6 +3,7 @@
|
||||
|
||||
PORTNAME= tcpdump
|
||||
PORTVERSION= 4.7.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= net ipv6
|
||||
MASTER_SITES= http://www.tcpdump.org/release/
|
||||
|
||||
|
41
net/tcpdump/files/patch-print-wb.c
Normal file
41
net/tcpdump/files/patch-print-wb.c
Normal file
@ -0,0 +1,41 @@
|
||||
From 8aa5edea1b8846740514dee4158b6c707d38fc13 Mon Sep 17 00:00:00 2001
|
||||
From: Denis Ovsienko <denis@ovsienko.info>
|
||||
Date: Wed, 25 Mar 2015 22:35:12 +0000
|
||||
Subject: [PATCH] whiteboard: fixup a few reversed tests (GH #446)
|
||||
|
||||
This is a follow-up to commit 3a3ec26.
|
||||
---
|
||||
print-wb.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/print-wb.c b/print-wb.c
|
||||
index 38c2a67..e10d532 100644
|
||||
--- a/print-wb.c
|
||||
+++ print-wb.c
|
||||
@@ -202,7 +202,7 @@ wb_id(netdissect_options *ndo,
|
||||
len -= sizeof(*io) * nid;
|
||||
io = (struct id_off *)(id + 1);
|
||||
cp = (char *)(io + nid);
|
||||
- if (!ND_TTEST2(cp, len)) {
|
||||
+ if (ND_TTEST2(cp, len)) {
|
||||
ND_PRINT((ndo, "\""));
|
||||
fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
|
||||
ND_PRINT((ndo, "\""));
|
||||
@@ -267,7 +267,7 @@ wb_prep(netdissect_options *ndo,
|
||||
}
|
||||
n = EXTRACT_32BITS(&prep->pp_n);
|
||||
ps = (const struct pgstate *)(prep + 1);
|
||||
- while (--n >= 0 && !ND_TTEST(*ps)) {
|
||||
+ while (--n >= 0 && ND_TTEST(*ps)) {
|
||||
const struct id_off *io, *ie;
|
||||
char c = '<';
|
||||
|
||||
@@ -276,7 +276,7 @@ wb_prep(netdissect_options *ndo,
|
||||
ipaddr_string(ndo, &ps->page.p_sid),
|
||||
EXTRACT_32BITS(&ps->page.p_uid)));
|
||||
io = (struct id_off *)(ps + 1);
|
||||
- for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) {
|
||||
+ for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
|
||||
ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
|
||||
EXTRACT_32BITS(&io->off)));
|
||||
c = ',';
|
Loading…
Reference in New Issue
Block a user