Thu May 21 13:14:25 1998 John Metzler <jmetzler@cygnus.com>

[deliverable/binutils-gdb.git] / gdb / ch-valprint.c

diff --git a/gdb/ch-valprint.c b/gdb/ch-valprint.c
index 9b201370c6910e70b51cb9b0868186d0cc328665..911c693f3c0e8ca5163fe2e3089076949aa66685 100644 (file)
--- a/gdb/ch-valprint.c
+++ b/gdb/ch-valprint.c
@@ -36,6 +36,13 @@ static void
 chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int,
                                  enum val_prettyprint, struct type **));
 
+static void
+chill_print_type_scalar PARAMS ((struct type *, LONGEST, GDB_FILE *));
+
+static void
+chill_val_print_array_elements PARAMS ((struct type *, char *, CORE_ADDR, GDB_FILE *,
+                                       int, int, int, enum val_prettyprint));
+
 \f
 /* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
    Used to print data from type structures in a specified type.  For example,
@@ -43,7 +50,7 @@ chill_print_value_fields PARAMS ((struct type *, char *, GDB_FILE *, int, int,
    allows the ranges to be printed in their "natural" form rather than as
    decimal integer values. */
 
-void
+static void
 chill_print_type_scalar (type, val, stream)
      struct type *type;
      LONGEST val;
@@ -382,7 +389,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
              {
                if (need_comma)
                  fputs_filtered (", ", stream);
-               chill_print_type_scalar (range, i, stream);
+               chill_print_type_scalar (range, (LONGEST) i, stream);
                need_comma = 1;
 
                /* Look for a continuous range of true elements. */
@@ -393,7 +400,7 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
                    while (i+1 <= high_bound
                           && value_bit_index (type, valaddr, ++i))
                      j = i;
-                   chill_print_type_scalar (range, j, stream);
+                   chill_print_type_scalar (range, (LONGEST) j, stream);
                  }
              }
          }
@@ -415,11 +422,15 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
          switch (TYPE_CODE (inner))
            {
            case TYPE_CODE_STRING:
-             if (length > TYPE_LENGTH (type))
+             if (length > TYPE_LENGTH (type) - 2)
                {
                  fprintf_filtered (stream,
-                                   "<dynamic length %ld > static length %d>",
+                                   "<dynamic length %ld > static length %d> *invalid*",
                                    length, TYPE_LENGTH (type));
+
+                 /* Don't print the string; doing so might produce a
+                    segfault.  */
+                 return length;
                }
              LA_PRINT_STRING (stream, data_addr, length, 0);
              return length;
@@ -452,7 +463,8 @@ chill_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
                value_at
                  (TYPE_TARGET_TYPE (type),
                   unpack_pointer (lookup_pointer_type (builtin_type_void),
-                                  valaddr));
+                                  valaddr),
+                  NULL);
              val_print (VALUE_TYPE (deref_val),
                         VALUE_CONTENTS (deref_val),
                         VALUE_ADDRESS (deref_val), stream, format,