1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
Index: print-rx.c
===================================================================
RCS file: /home/ncvs/src/contrib/tcpdump/print-rx.c,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- print-rx.c 2000/10/05 02:56:32 1.1.1.1.2.1
+++ print-rx.c 2001/07/09 01:44:11 1.1.1.1.2.2
@@ -580,14 +580,16 @@
printf(" fid %d/%d/%d", (int) n1, (int) n2, (int) n3); \
}
-#define STROUT(MAX) { int i; \
+#define STROUT(MAX) { unsigned int i; \
TRUNC(sizeof(int32_t)); \
- i = (int) ntohl(*((int *) bp)); \
+ i = ntohl(*((int *) bp)); \
+ if (i > MAX) \
+ goto trunc; \
bp += sizeof(int32_t); \
- TRUNC(i); \
- strncpy(s, bp, min(MAX, i)); \
- s[i] = '\0'; \
- printf(" \"%s\"", s); \
+ printf(" \""); \
+ if (fn_printn(bp, i, snapend)) \
+ goto trunc; \
+ printf("\""); \
bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \
}
@@ -672,7 +674,9 @@
bp += sizeof(int32_t); \
} \
s[MAX] = '\0'; \
- printf(" \"%s\"", s); \
+ printf(" \""); \
+ fn_print(s, NULL); \
+ printf("\""); \
}
/*
@@ -954,7 +958,9 @@
if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
goto finish;
s += n;
- printf(" +{%s ", user);
+ printf(" +{");
+ fn_print(user, NULL);
+ printf(" ");
ACLOUT(acl);
printf("}");
if (s > end)
@@ -965,7 +971,9 @@
if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
goto finish;
s += n;
- printf(" -{%s ", user);
+ printf(" -{");
+ fn_print(user, NULL);
+ printf(" ");
ACLOUT(acl);
printf("}");
if (s > end)
|
