X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/50c77d8419b7b6e5ef5c3f89d08541ff7ea7d174..64e81f2917f6865dff8df96e18cec1b8bf2fa836:/print-rx.c

diff --git a/print-rx.c b/print-rx.c
index cb240ceb..2fb3d2a8 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.17 2000-09-24 07:44:33 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.20 2001-01-10 08:12:01 fenner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -21,6 +21,7 @@ static const char rcsid[] =
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <sys/param.h>
@@ -28,7 +29,6 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <arpa/inet.h>
 
 #include "interface.h"
@@ -378,7 +378,7 @@ static int	rx_cache_find(const struct rx_header *, const struct ip *,
 static void ack_print(const u_char *, int);
 static void fs_print(const u_char *, int);
 static void fs_reply_print(const u_char *, int, int32_t);
-static void acl_print(u_char *, u_char *);
+static void acl_print(u_char *, int, u_char *);
 static void cb_print(const u_char *, int);
 static void cb_reply_print(const u_char *, int, int32_t);
 static void prot_print(const u_char *, int);
@@ -871,15 +871,16 @@ fs_print(register const u_char *bp, int length)
 			break;
 		case 134:	/* Store ACL */
 		{
-			char a[AFSOPAQUEMAX];
+			char a[AFSOPAQUEMAX+1];
 			FIDOUT();
 			TCHECK2(bp[0], 4);
 			i = EXTRACT_32BITS(bp);
 			bp += sizeof(int32_t);
 			TCHECK2(bp[0], i);
-			strncpy(a, (char *) bp, min(AFSOPAQUEMAX, i));
+			i = min(AFSOPAQUEMAX, i);
+			strncpy(a, (char *) bp, i);
 			a[i] = '\0';
-			acl_print((u_char *) a, (u_char *) a + i);
+			acl_print((u_char *) a, sizeof(a), (u_char *) a + i);
 			break;
 		}
 		case 137:	/* Create file */
@@ -983,14 +984,15 @@ fs_reply_print(register const u_char *bp, int length, int32_t opcode)
 		switch (opcode) {
 		case 131:	/* Fetch ACL */
 		{
-			char a[AFSOPAQUEMAX];
+			char a[AFSOPAQUEMAX+1];
 			TCHECK2(bp[0], 4);
 			i = EXTRACT_32BITS(bp);
 			bp += sizeof(int32_t);
 			TCHECK2(bp[0], i);
-			strncpy(a, (char *) bp, min(AFSOPAQUEMAX, i));
+			i = min(AFSOPAQUEMAX, i);
+			strncpy(a, (char *) bp, i);
 			a[i] = '\0';
-			acl_print((u_char *) a, (u_char *) a + i);
+			acl_print((u_char *) a, sizeof(a), (u_char *) a + i);
 			break;
 		}
 		case 137:	/* Create file */
@@ -1044,19 +1046,22 @@ trunc:
  */
 
 static void
-acl_print(u_char *s, u_char *end)
+acl_print(u_char *s, int maxsize, u_char *end)
 {
 	int pos, neg, acl;
 	int n, i;
-	char user[128];
+	char *user;
 
-	if (sscanf((char *) s, "%d %d\n%n", &pos, &neg, &n) != 2)
+	if ((user = (char *)malloc(maxsize)) == NULL)
 		return;
+
+	if (sscanf((char *) s, "%d %d\n%n", &pos, &neg, &n) != 2)
+		goto finish;
 	
 	s += n;
 
 	if (s > end)
-		return;
+		goto finish;
 
 	/*
 	 * This wacky order preserves the order used by the "fs" command
@@ -1080,25 +1085,29 @@ acl_print(u_char *s, u_char *end)
 
 	for (i = 0; i < pos; i++) {
 		if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
-			return;
+			goto finish;
 		s += n;
 		printf(" +{%s ", user);
 		ACLOUT(acl);
 		printf("}");
 		if (s > end)
-			return;
+			goto finish;
 	}
 
 	for (i = 0; i < neg; i++) {
 		if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
-			return;
+			goto finish;
 		s += n;
 		printf(" -{%s ", user);
 		ACLOUT(acl);
 		printf("}");
 		if (s > end)
-			return;
+			goto finish;
 	}
+
+finish:
+	free(user);
+	return;
 }
 
 #undef ACLOUT