diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e30e0995546c921aed3b21d3f68ef05eee001810..97b609bf2f5649233870b48705fe6e4159db8048 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 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.
 
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index c01687a44805c2c079fe8f3e0d64cdb45945fafe..1849349f49a0866ec34eadaaadc7a05b4693781b 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;