Don't dump core if a null "struct tok" array pointer is passed to

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 34640b4ff086c3c29fb5dfceeaf194ee59cf44e9..1b8948501338c7af78a1f96de52c0de3cda8c284 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.13 2003-12-29 10:30:40 hannes Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.16 2004-07-21 22:00:10 guy Exp $";
 #endif
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
@@ -57,7 +57,7 @@ static const char rcsid[] _U_ =
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
 void
-ascii_print_with_offset(register const u_char *ident, register const u_char *cp, register u_int length,
+ascii_print_with_offset(register const char *ident, register const u_char *cp, register u_int length,
                        register u_int oset)
 {
        register u_int i;
@@ -93,7 +93,7 @@ ascii_print_with_offset(register const u_char *ident, register const u_char *cp,
                        if (Aflag) {
                                (void)printf("%s", asciistuff);
                        } else {
-                               (void)printf("%s0x%04x:\t%-*s\t%s",
+                               (void)printf("%s0x%04x: %-*s  %s",
                                    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                                    hexstuff, asciistuff);
                        }
@@ -118,7 +118,7 @@ ascii_print_with_offset(register const u_char *ident, register const u_char *cp,
                if (Aflag) {
                        (void)printf("%s%s", ident, asciistuff);
                } else {
-                       (void)printf("%s0x%04x:\t%-*s\t%s",
+                       (void)printf("%s0x%04x: %-*s  %s",
                             ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
                             hexstuff, asciistuff);
                }
@@ -126,7 +126,7 @@ ascii_print_with_offset(register const u_char *ident, register const u_char *cp,
 }
 
 void
-ascii_print(register const u_char *ident, register const u_char *cp, register u_int length)
+ascii_print(register const char *ident, register const u_char *cp, register u_int length)
 {
        ascii_print_with_offset(ident, cp, length, 0);
 }
@@ -135,7 +135,7 @@ ascii_print(register const u_char *ident, register const u_char *cp, register u_
  * telnet_print() wants this.  It is essentially default_print_unaligned()
  */
 void
-hex_print_with_offset(register const u_char *cp, register u_int length,
+hex_print_with_offset(register const char *ident, register const u_char *cp, register u_int length,
                      register u_int oset)
 {
        register u_int i, s;
@@ -145,7 +145,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {
-                       (void)printf("\n0x%04x\t", oset);
+                       (void)printf("%s0x%04x: ", ident, oset);
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;
@@ -153,7 +153,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
        }
        if (length & 1) {
                if ((i % 8) == 0)
-                       (void)printf("\n0x%04x\t", oset);
+                       (void)printf("%s0x%04x: ", ident, oset);
                (void)printf(" %02x", *cp);
        }
 }
@@ -162,9 +162,9 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
  * just for completeness
  */
 void
-hex_print(register const u_char *cp, register u_int length)
+hex_print(register const char *ident, register const u_char *cp, register u_int length)
 {
-       hex_print_with_offset(cp, length, 0);
+       hex_print_with_offset(ident, cp, length, 0);
 }
 
 #ifdef MAIN