You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
118 lines
2.8 KiB
118 lines
2.8 KiB
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
|
From: Keith Seitz <keiths@redhat.com>
|
|
Date: Thu, 12 Oct 2023 15:03:51 -0400
|
|
Subject: gdb-rhel-4237-rust-demangler-recursion-limit-1of2.patch
|
|
|
|
;; Backport "Add a recursion limit to the demangle_const function
|
|
;; in the Rust demangler."
|
|
;; (Nick Clifton, RHEL-4237)
|
|
|
|
libiberty/
|
|
PR demangler/105039
|
|
* rust-demangle.c (demangle_const): Add recursion limit.
|
|
|
|
diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
|
|
--- a/libiberty/rust-demangle.c
|
|
+++ b/libiberty/rust-demangle.c
|
|
@@ -126,7 +126,7 @@ parse_integer_62 (struct rust_demangler *rdm)
|
|
return 0;
|
|
|
|
x = 0;
|
|
- while (!eat (rdm, '_'))
|
|
+ while (!eat (rdm, '_') && !rdm->errored)
|
|
{
|
|
c = next (rdm);
|
|
x *= 62;
|
|
@@ -1082,6 +1082,18 @@ demangle_path_maybe_open_generics (struct rust_demangler *rdm)
|
|
if (rdm->errored)
|
|
return open;
|
|
|
|
+ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
|
|
+ {
|
|
+ ++ rdm->recursion;
|
|
+ if (rdm->recursion > RUST_MAX_RECURSION_COUNT)
|
|
+ {
|
|
+ /* FIXME: There ought to be a way to report
|
|
+ that the recursion limit has been reached. */
|
|
+ rdm->errored = 1;
|
|
+ goto end_of_func;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (eat (rdm, 'B'))
|
|
{
|
|
backref = parse_integer_62 (rdm);
|
|
@@ -1107,6 +1119,11 @@ demangle_path_maybe_open_generics (struct rust_demangler *rdm)
|
|
}
|
|
else
|
|
demangle_path (rdm, 0);
|
|
+
|
|
+ end_of_func:
|
|
+ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
|
|
+ -- rdm->recursion;
|
|
+
|
|
return open;
|
|
}
|
|
|
|
@@ -1148,6 +1165,15 @@ demangle_const (struct rust_demangler *rdm)
|
|
if (rdm->errored)
|
|
return;
|
|
|
|
+ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
|
|
+ {
|
|
+ ++ rdm->recursion;
|
|
+ if (rdm->recursion > RUST_MAX_RECURSION_COUNT)
|
|
+ /* FIXME: There ought to be a way to report
|
|
+ that the recursion limit has been reached. */
|
|
+ goto fail_return;
|
|
+ }
|
|
+
|
|
if (eat (rdm, 'B'))
|
|
{
|
|
backref = parse_integer_62 (rdm);
|
|
@@ -1158,7 +1184,7 @@ demangle_const (struct rust_demangler *rdm)
|
|
demangle_const (rdm);
|
|
rdm->next = old_next;
|
|
}
|
|
- return;
|
|
+ goto pass_return;
|
|
}
|
|
|
|
ty_tag = next (rdm);
|
|
@@ -1167,7 +1193,7 @@ demangle_const (struct rust_demangler *rdm)
|
|
/* Placeholder. */
|
|
case 'p':
|
|
PRINT ("_");
|
|
- return;
|
|
+ goto pass_return;
|
|
|
|
/* Unsigned integer types. */
|
|
case 'h':
|
|
@@ -1200,18 +1226,20 @@ demangle_const (struct rust_demangler *rdm)
|
|
break;
|
|
|
|
default:
|
|
- rdm->errored = 1;
|
|
- return;
|
|
+ goto fail_return;
|
|
}
|
|
|
|
- if (rdm->errored)
|
|
- return;
|
|
-
|
|
- if (rdm->verbose)
|
|
+ if (!rdm->errored && rdm->verbose)
|
|
{
|
|
PRINT (": ");
|
|
PRINT (basic_type (ty_tag));
|
|
}
|
|
+
|
|
+ fail_return:
|
|
+ rdm->errored = 1;
|
|
+ pass_return:
|
|
+ if (rdm->recursion != RUST_NO_RECURSION_LIMIT)
|
|
+ -- rdm->recursion;
|
|
}
|
|
|
|
static void
|