diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-10-04 20:47:06 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-10-25 14:51:44 -0400 |
| commit | 50888e42dcd32b30e1144c0aa6d1c1490da45cd9 (patch) | |
| tree | 72fad89d67057ecb53f26bac0464542829053e3e /gdb/rust-lang.c | |
| parent | d9f82e931394efed68858eb7c7bb5832ad888482 (diff) | |
| download | gdb-50888e42dcd32b30e1144c0aa6d1c1490da45cd9.zip gdb-50888e42dcd32b30e1144c0aa6d1c1490da45cd9.tar.gz gdb-50888e42dcd32b30e1144c0aa6d1c1490da45cd9.tar.bz2 | |
gdb: change functions returning value contents to use gdb::array_view
The bug fixed by this [1] patch was caused by an out-of-bounds access to
a value's content. The code gets the value's content (just a pointer)
and then indexes it with a non-sensical index.
This made me think of changing functions that return value contents to
return array_views instead of a plain pointer. This has the advantage
that when GDB is built with _GLIBCXX_DEBUG, accesses to the array_view
are checked, making bugs more apparent / easier to find.
This patch changes the return types of these functions, and updates
callers to call .data() on the result, meaning it's not changing
anything in practice. Additional work will be needed (which can be done
little by little) to make callers propagate the use of array_view and
reap the benefits.
[1] https://sourceware.org/pipermail/gdb-patches/2021-September/182306.html
Change-Id: I5151f888f169e1c36abe2cbc57620110673816f3
Diffstat (limited to 'gdb/rust-lang.c')
| -rw-r--r-- | gdb/rust-lang.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 3c6a358..1da758f 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -415,8 +415,9 @@ rust_language::print_enum (struct value *val, struct ui_file *stream, opts.deref_ref = 0; gdb_assert (rust_enum_p (type)); - gdb::array_view<const gdb_byte> view (value_contents_for_printing (val), - TYPE_LENGTH (value_type (val))); + gdb::array_view<const gdb_byte> view + (value_contents_for_printing (val).data (), + TYPE_LENGTH (value_type (val))); type = resolve_dynamic_type (type, view, value_address (val)); if (rust_empty_enum_p (type)) @@ -558,7 +559,7 @@ rust_language::value_print_inner encoding. */ fputs_filtered ("b", stream); printstr (stream, TYPE_TARGET_TYPE (type), - value_contents_for_printing (val), + value_contents_for_printing (val).data (), high_bound - low_bound + 1, "ASCII", 0, &opts); } break; @@ -1316,7 +1317,7 @@ eval_op_rust_struct_anon (struct type *expect_type, struct expression *exp, if (rust_enum_p (type)) { - gdb::array_view<const gdb_byte> view (value_contents (lhs), + gdb::array_view<const gdb_byte> view (value_contents (lhs).data (), TYPE_LENGTH (type)); type = resolve_dynamic_type (type, view, value_address (lhs)); @@ -1379,7 +1380,7 @@ eval_op_rust_structop (struct type *expect_type, struct expression *exp, struct type *type = value_type (lhs); if (type->code () == TYPE_CODE_STRUCT && rust_enum_p (type)) { - gdb::array_view<const gdb_byte> view (value_contents (lhs), + gdb::array_view<const gdb_byte> view (value_contents (lhs).data (), TYPE_LENGTH (type)); type = resolve_dynamic_type (type, view, value_address (lhs)); |