diff options
| author | Ben L <bobsayshilol@live.co.uk> | 2019-04-30 14:36:24 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2019-04-30 08:36:24 -0600 |
| commit | dba20a51404e7addd5e76dc8b912ecaa4469ef03 (patch) | |
| tree | c15b3ada61af03a8c5d97fbb8453390f2601adcb /libiberty | |
| parent | 80b1ab1579887f21a2d0d34abbe726cbff2706df (diff) | |
d-demangle.c (dlang_parse_structlit): Correctly handle error result.
* d-demangle.c (dlang_parse_structlit): Correctly handle error result.
* testsuite/d-demangle-expected: Add testcase.
From-SVN: r270698
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 3 | ||||
| -rw-r--r-- | libiberty/d-demangle.c | 3 | ||||
| -rw-r--r-- | libiberty/testsuite/d-demangle-expected | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 71d446bec1c..f528bb4e73e 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,5 +1,8 @@ 2019-04-30 Ben L <bobsayshilol@live.co.uk> + * d-demangle.c (dlang_parse_structlit): Correctly handle error result. + * testsuite/d-demangle-expected: Add testcase. + * d-demangle.c (dlang_parse_arrayliteral): Correctly handle error result. * testsuite/d-demangle-expected: Add testcase. diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c index 303d2eeafad..5590417c205 100644 --- a/libiberty/d-demangle.c +++ b/libiberty/d-demangle.c @@ -1246,6 +1246,9 @@ dlang_parse_structlit (string *decl, const char *mangled, const char *name) while (args--) { mangled = dlang_value (decl, mangled, NULL, '\0'); + if (mangled == NULL) + return NULL; + if (args != 0) string_append (decl, ", "); } diff --git a/libiberty/testsuite/d-demangle-expected b/libiberty/testsuite/d-demangle-expected index 19665f55624..0a5f9da8091 100644 --- a/libiberty/testsuite/d-demangle-expected +++ b/libiberty/testsuite/d-demangle-expected @@ -1314,3 +1314,7 @@ _D8__T2fnVa8888888888888_ --format=dlang _D5__T2fnVmA1A1A911111111D _D5__T2fnVmA1A1A911111111D +# Could crash +--format=dlang +_D7__T2fnVlS8S588888888888S6S5 +_D7__T2fnVlS8S588888888888S6S5 |