Better fix for PR 20499, including preventing strlen from being called on an uninitia...

[external/binutils.git] / gdb / go-typeprint.c

diff --git a/gdb/go-typeprint.c b/gdb/go-typeprint.c
index a76c3dc..358508e 100644 (file)
--- a/gdb/go-typeprint.c
+++ b/gdb/go-typeprint.c
@@ -1,6 +1,6 @@
 /* Support for printing Go types for GDB, the GNU debugger.
 
 /* Support for printing Go types for GDB, the GNU debugger.
 

-   Copyright (C) 2012 Free Software Foundation, Inc.
+   Copyright (C) 2012-2016 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -43,11 +43,12 @@
 
 void
 go_print_type (struct type *type, const char *varstring,
 
 void
 go_print_type (struct type *type, const char *varstring,

-              struct ui_file *stream, int show, int level)
+              struct ui_file *stream, int show, int level,
+              const struct type_print_options *flags)

 {
   /* Borrowed from c-typeprint.c.  */
   if (show > 0)
 {
   /* Borrowed from c-typeprint.c.  */
   if (show > 0)

-    CHECK_TYPEDEF (type);
+    type = check_typedef (type);

 
   /* Print the type of "abc" as "string", not char[4].  */
   if (TYPE_CODE (type) == TYPE_CODE_ARRAY
 
   /* Print the type of "abc" as "string", not char[4].  */
   if (TYPE_CODE (type) == TYPE_CODE_ARRAY


@@ -58,5 +59,5 @@ go_print_type (struct type *type, const char *varstring,
     }
 
   /* Punt the rest to C for now.  */
     }
 
   /* Punt the rest to C for now.  */

-  c_print_type (type, varstring, stream, show, level);
+  c_print_type (type, varstring, stream, show, level, flags);

 }
 }