diff options
| author | Ben L <bobsayshilol@live.co.uk> | 2019-04-30 14:22:41 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2019-04-30 08:22:41 -0600 |
| commit | 80024f3180b9c4c904cd65323e1d1333cf19d1fe (patch) | |
| tree | a315c6b8b02c4fb989e8fefed7e4b5ff6d0bdaff /libiberty | |
| parent | 927e42fd52ed7dee859ac85fec9dd6830d769773 (diff) | |
| download | gcc-80024f3180b9c4c904cd65323e1d1333cf19d1fe.zip gcc-80024f3180b9c4c904cd65323e1d1333cf19d1fe.tar.gz gcc-80024f3180b9c4c904cd65323e1d1333cf19d1fe.tar.bz2 | |
cp-demangle (d_print_comp_inner): Guard against a NULL 'typed_name'.
* cp-demangle (d_print_comp_inner): Guard against a NULL 'typed_name'.
* testsuite/demangle-expected: Add testcase.
From-SVN: r270695
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 3 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 13 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 25a219a..6e9691c 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,8 @@ 2019-04-30 Ben L <bobsayshilol@live.co.uk> + * cp-demangle (d_print_comp_inner): Guard against a NULL 'typed_name'. + * testsuite/demangle-expected: Add testcase. + * cp-demangle.c (d_encoding): Guard against NULL return values from d_right (dc). * testsuite/demangle-expected: Add testcase. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index f8c4c1d..4e5b733 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -4767,12 +4767,8 @@ d_print_comp_inner (struct d_print_info *dpi, int options, typed_name = d_right (typed_name); if (typed_name->type == DEMANGLE_COMPONENT_DEFAULT_ARG) typed_name = typed_name->u.s_unary_num.sub; - if (typed_name == NULL) - { - d_print_error (dpi); - return; - } - while (is_fnqual_component_type (typed_name->type)) + while (typed_name != NULL + && is_fnqual_component_type (typed_name->type)) { if (i >= sizeof adpm / sizeof adpm[0]) { @@ -4791,6 +4787,11 @@ d_print_comp_inner (struct d_print_info *dpi, int options, typed_name = d_left (typed_name); } + if (typed_name == NULL) + { + d_print_error (dpi); + return; + } } /* If typed_name is a template, then it applies to the diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index eb5264db..f21ed00 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -77,6 +77,10 @@ _ZmmAtl _ZZaSFvOEES_ _ZZaSFvOEES_ _ZZaSFvOEES_ +# Could crash + +_ZZeqFvOEES_z +_ZZeqFvOEES_z # # demangler/80513 Test for bogus characters after __thunk_ |