summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/json.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/json.c b/src/json.c
index 72b065f9a..f97d28312 100644
--- 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 b252d9937..34922b6ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1243,
+/**/
1242,
/**/
1241,