[Bug c++/70498] Libiberty Demangler segfaults (3)

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70498

--- Comment #6 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Author: jakub
Date: Thu May 19 08:53:19 2016
New Revision: 236446

URL: https://gcc.gnu.org/viewcvs?rev=236446&root=gcc&view=rev
Log:
        Backported from mainline
        2016-05-19  Jakub Jelinek  <jakub@redhat.com>

        PR c++/70498
        * cp-demangle.c (d_expression_1): Formatting fix.

        2016-05-02  Marcel Böhme  <boehme.marcel@gmail.com>

        PR c++/70498
        * cp-demangle.c: Parse numbers as integer instead of long to avoid
        overflow after sanity checks. Include <limits.h> if available.
        (INT_MAX): Define if necessary.
        (d_make_template_param): Takes integer argument instead of long.
        (d_make_function_param): Likewise.
        (d_append_num): Likewise.
        (d_identifier): Likewise.
        (d_number): Parse as and return integer.
        (d_compact_number): Handle overflow.
        (d_source_name): Change variable type to integer for parsed number.
        (d_java_resource): Likewise.
        (d_special_name): Likewise.
        (d_discriminator): Likewise.
        (d_unnamed_type): Likewise.
        * testsuite/demangle-expected: Add regression test cases.

Modified:
    branches/gcc-6-branch/libiberty/ChangeLog
    branches/gcc-6-branch/libiberty/cp-demangle.c
    branches/gcc-6-branch/libiberty/testsuite/demangle-expected