diff options
author | Tom Tromey <tom@tromey.com> | 2016-11-08 20:22:29 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2016-11-12 10:34:46 -0700 |
commit | d93f4d96bb0fb307db9e2dade38ddb3c6bc469ca (patch) | |
tree | 406f33f8619ea14abbfed0450ece76fd1e236cae | |
parent | 6cb2202baaf482a8c7d54e5ec93af2f057e7ce28 (diff) | |
download | gdb-d93f4d96bb0fb307db9e2dade38ddb3c6bc469ca.zip gdb-d93f4d96bb0fb307db9e2dade38ddb3c6bc469ca.tar.gz gdb-d93f4d96bb0fb307db9e2dade38ddb3c6bc469ca.tar.bz2 |
Use std::string in rust_get_disr_info
This changes rust_get_disr_info to use std::string in one more spot,
avoiding a memory leak.
2016-11-12 Tom Tromey <tom@tromey.com>
* rust-lang.c (rust_get_disr_info): Use std::string in one more
spot.
-rw-r--r-- | gdb/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/rust-lang.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 99edafc..1f32c02 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-11-12 Tom Tromey <tom@tromey.com> + + * rust-lang.c (rust_get_disr_info): Use std::string in one more + spot. + 2016-11-11 Yao Qi <yao.qi@linaro.org> * spu-tdep.c (spu_software_single_step): Don't call diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 295dae1..7d4bfc3 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -222,7 +222,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr, with the first field being the actual type works. */ const char *field_name = TYPE_NAME (TYPE_FIELD_TYPE (type, 0)); const char *last = rust_last_path_segment (field_name); - ret.name = concat (TYPE_NAME (type), "::", last, (char *) NULL); + ret.name = std::string (TYPE_NAME (type)) + "::" + last; ret.field_no = RUST_ENCODED_ENUM_REAL; ret.is_encoded = 1; return ret; |