From: itojun <itojun>
Date: Sat, 29 Jan 2000 16:47:46 +0000 (+0000)
Subject: fix ascii dump with -X.  due to mistake in snprintf() fixes.
X-Git-Tag: tcpdump-3.5.1~367
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c87b499eac2cdd7e48e25154a9942f839cc6b8b7

fix ascii dump with -X.  due to mistake in snprintf() fixes.
(no need to pull into 3.5)
---

diff --git a/print-ascii.c b/print-ascii.c
index a97faf77..c8f65fd3 100644
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.5 2000-01-17 06:24:24 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.6 2000-01-29 16:47:46 itojun Exp $";
 #endif
 #include <stdio.h>
 #include <sys/types.h>
@@ -72,7 +72,8 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
 	while (--nshorts >= 0) {
 		s1 = *cp++;
 		s2 = *cp++;
-		(void)snprintf(hsp, sizeof(hsp), " %02x%02x", s1, s2);
+		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+		    " %02x%02x", s1, s2);
 		hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
 		*(asp++) = (isgraph(s1) ? s1 : '.');
 		*(asp++) = (isgraph(s2) ? s2 : '.');
@@ -87,7 +88,8 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
 	}
 	if (length & 1) {
 		s1 = *cp++;
-		(void)snprintf(hsp, sizeof(hsp), " %02x", s1);
+		(void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+		    " %02x", s1);
 		hsp += 3;
 		*(asp++) = (isgraph(s1) ? s1 : '.');
 		++i;