diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 3 | ||||
| -rw-r--r-- | gdbsupport/ChangeLog | 4 | ||||
| -rw-r--r-- | gdbsupport/environ.c | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c751df7d9a5..ab02a74a61d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-02-10 Tom de Vries <tdevries@suse.de> + + * dwarf2/read.c (process_psymtab_comp_unit_reader): Cast concat NULL + sentinel to char *. + 2020-02-09 Tom de Vries <tdevries@suse.de> * dwarf2read.c (process_psymtab_comp_unit_reader): Append CU offset to diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 9e66e613cd6..7edbd9d7dfa 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7260,7 +7260,8 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader, else if (strcmp (filename, artificial) == 0) { debug_filename.reset (concat (artificial, "@", - sect_offset_str (per_cu->sect_off), NULL)); + sect_offset_str (per_cu->sect_off), + (char *) NULL)); filename = debug_filename.get (); } diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 6ea2f2c2530..3225befc3df 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,7 @@ +2020-02-10 Tom de Vries <tdevries@suse.de> + + * environ.c (gdb_environ::set): Cast concat NULL sentinel to char *. + 2020-01-24 Christian Biesinger <cbiesinger@google.com> * thread-pool.c (set_thread_name): Add an overload for the NetBSD diff --git a/gdbsupport/environ.c b/gdbsupport/environ.c index 55d0a74c372..32434ee0b74 100644 --- a/gdbsupport/environ.c +++ b/gdbsupport/environ.c @@ -105,7 +105,7 @@ gdb_environ::get (const char *var) const void gdb_environ::set (const char *var, const char *value) { - char *fullvar = concat (var, "=", value, NULL); + char *fullvar = concat (var, "=", value, (char *) NULL); /* We have to unset the variable in the vector if it exists. */ unset (var, false); |