summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/tcpdump/files/tcpdump-4.6.2-CVE-2014-9140.patch')
-rw-r--r--net-analyzer/tcpdump/files/tcpdump-4.6.2-CVE-2014-9140.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/net-analyzer/tcpdump/files/tcpdump-4.6.2-CVE-2014-9140.patch b/net-analyzer/tcpdump/files/tcpdump-4.6.2-CVE-2014-9140.patch
deleted file mode 100644
index b8fb4114c0d6..000000000000
--- a/net-analyzer/tcpdump/files/tcpdump-4.6.2-CVE-2014-9140.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/print-ppp.c
-+++ b/print-ppp.c
-@@ -1351,14 +1351,15 @@ static void
- ppp_hdlc(netdissect_options *ndo,
- const u_char *p, int length)
- {
-- u_char *b, *s, *t, c;
-+ u_char *b, *t, c;
-+ const u_char *s;
- int i, proto;
- const void *se;
-
- if (length <= 0)
- return;
-
-- b = (uint8_t *)malloc(length);
-+ b = (u_char *)malloc(length);
- if (b == NULL)
- return;
-
-@@ -1367,14 +1368,13 @@ ppp_hdlc(netdissect_options *ndo,
- * Do this so that we dont overwrite the original packet
- * contents.
- */
-- for (s = (u_char *)p, t = b, i = length; i > 0; i--) {
-+ for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) {
- c = *s++;
- if (c == 0x7d) {
-- if (i > 1) {
-- i--;
-- c = *s++ ^ 0x20;
-- } else
-- continue;
-+ if (i <= 1 || !ND_TTEST(*s))
-+ break;
-+ i--;
-+ c = *s++ ^ 0x20;
- }
- *t++ = c;
- }