aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/rust-lang.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e30e099..97b609b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,11 @@
2016-06-29 Manish Goregaokar <manish@mozilla.com>
gdb/ChangeLog:
+ * rust-lang.c (rust_get_disr_info): Initialize saveptr to NULL.
+
+2016-06-29 Manish Goregaokar <manish@mozilla.com>
+
+gdb/ChangeLog:
* rust-lang.c (rust_get_disr_info): Use strtok_r instead of strsep.
2016-06-28 Yao Qi <yao.qi@linaro.org>
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index c01687a..1849349 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -121,7 +121,7 @@ rust_get_disr_info (struct type *type, const gdb_byte *valaddr,
if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX,
strlen (RUST_ENUM_PREFIX)) == 0)
{
- char *tail, *token, *name, *saveptr;
+ char *tail, *token, *name, *saveptr = NULL;
unsigned long fieldno;
struct type *member_type;
LONGEST value;