aboutsummaryrefslogtreecommitdiff
path: root/gdbsupport
diff options
context:
space:
mode:
Diffstat (limited to 'gdbsupport')
-rw-r--r--gdbsupport/ChangeLog4
-rw-r--r--gdbsupport/environ.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 6ea2f2c..3225bef 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 55d0a74..32434ee 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);