patch 7.4.1243

Problem:    Compiler warning for uninitialized variable.
Solution:   Initialize it. (Elias Diem)

diff --git a/src/json.c b/src/json.c
index 72b065f9ac2180f9cb0a8b2fd9ad585780d2a046..f97d2831203e2b611a0578cf8c7df47748157c49 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -339,7 +339,7 @@ json_decode_object(js_read_T *reader, typval_T *res)
     typval_T   item;
     dictitem_T *di;
     char_u     buf[NUMBUFLEN];
-    char_u     *key;
+    char_u     *key = NULL;
     int                ret;
 
     if (res != NULL && rettv_dict_alloc(res) == FAIL)

diff --git a/src/version.c b/src/version.c
index b252d993752189a97fcbd5bd60dcab13ca90507f..34922b6ea5e40afaa353d8758109bd970844937b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1243,
 /**/
     1242,
 /**/