0026-rust-recursion-limit.patch 2.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. From 9234cdca6ee88badfc00297e72f13dac4e540c79 Mon Sep 17 00:00:00 2001
  2. From: Nick Clifton <nickc@redhat.com>
  3. Date: Fri, 1 Jul 2022 15:58:52 +0100
  4. Subject: [PATCH] Add a recursion limit to the demangle_const function in the
  5. Rust demangler.
  6. libiberty/
  7. PR demangler/105039
  8. * rust-demangle.c (demangle_const): Add recursion limit.
  9. Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=9234cdca6ee88badfc00297e72f13dac4e540c79]
  10. ---
  11. libiberty/rust-demangle.c | 29 ++++++++++++++++++++---------
  12. 1 file changed, 20 insertions(+), 9 deletions(-)
  13. diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
  14. index bb58d900e27..36afcfae278 100644
  15. --- a/libiberty/rust-demangle.c
  16. +++ b/libiberty/rust-demangle.c
  17. @@ -126,7 +126,7 @@ parse_integer_62 (struct rust_demangler *rdm)
  18. return 0;
  19. x = 0;
  20. - while (!eat (rdm, '_'))
  21. + while (!eat (rdm, '_') && !rdm->errored)
  22. {
  23. c = next (rdm);
  24. x *= 62;
  25. @@ -1148,6 +1148,15 @@ demangle_const (struct rust_demangler *rdm)
  26. if (rdm->errored)
  27. return;
  28. + if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
  29. + {
  30. + ++ rdm->recursion;
  31. + if (rdm->recursion > RUST_MAX_RECURSION_COUNT)
  32. + /* FIXME: There ought to be a way to report
  33. + that the recursion limit has been reached. */
  34. + goto fail_return;
  35. + }
  36. +
  37. if (eat (rdm, 'B'))
  38. {
  39. backref = parse_integer_62 (rdm);
  40. @@ -1158,7 +1167,7 @@ demangle_const (struct rust_demangler *rdm)
  41. demangle_const (rdm);
  42. rdm->next = old_next;
  43. }
  44. - return;
  45. + goto pass_return;
  46. }
  47. ty_tag = next (rdm);
  48. @@ -1167,7 +1176,7 @@ demangle_const (struct rust_demangler *rdm)
  49. /* Placeholder. */
  50. case 'p':
  51. PRINT ("_");
  52. - return;
  53. + goto pass_return;
  54. /* Unsigned integer types. */
  55. case 'h':
  56. @@ -1200,18 +1209,20 @@ demangle_const (struct rust_demangler *rdm)
  57. break;
  58. default:
  59. - rdm->errored = 1;
  60. - return;
  61. + goto fail_return;
  62. }
  63. - if (rdm->errored)
  64. - return;
  65. -
  66. - if (rdm->verbose)
  67. + if (!rdm->errored && rdm->verbose)
  68. {
  69. PRINT (": ");
  70. PRINT (basic_type (ty_tag));
  71. }
  72. +
  73. + fail_return:
  74. + rdm->errored = 1;
  75. + pass_return:
  76. + if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
  77. + -- rdm->recursion;
  78. }
  79. static void
  80. --
  81. 2.31.1