Prevent illegal memory accesses triggerd by intger overflow when parsing corrupt...

[deliverable/binutils-gdb.git] / binutils / cxxfilt.c

diff --git a/binutils/cxxfilt.c b/binutils/cxxfilt.c
index 157ebe02d524ef1658e5d575356430d0367e9272..e7272445c901c93a7a652fc73c59f7cf266e78af 100644 (file)
--- a/binutils/cxxfilt.c
+++ b/binutils/cxxfilt.c
@@ -1,5 +1,5 @@
 /* Demangler for GNU C++ - main program
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2018 Free Software Foundation, Inc.
    Written by James Clark (jjc@jclark.uucp)
    Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling
    Modified by Satish Pai (pai@apollo.hp.com) for HP demangling
@@ -87,7 +87,7 @@ print_demangler_list (FILE *stream)
   fprintf (stream, "}");
 }
 
-static void
+ATTRIBUTE_NORETURN static void
 usage (FILE *stream, int status)
 {
   fprintf (stream, "\
@@ -176,6 +176,7 @@ main (int argc, char **argv)
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);
+  bfd_set_error_program_name (program_name);
 
   expandargv (&argc, &argv);
 
@@ -239,6 +240,8 @@ main (int argc, char **argv)
     case edg_demangling:
     case gnat_demangling:
     case gnu_v3_demangling:
+    case dlang_demangling:
+    case rust_demangling:
     case auto_demangling:
       valid_symbols = standard_symbol_characters ();
       break;