diff --git a/src/blob.c b/src/blob.c index 9dc7926f44..ec305d6660 100644 --- a/src/blob.c +++ b/src/blob.c @@ -232,6 +232,8 @@ string2blob(char_u *str) blob_T *blob = blob_alloc(); char_u *s = str; + if (blob == NULL) + return NULL; if (s[0] != '0' || (s[1] != 'z' && s[1] != 'Z')) goto failed; s += 2; diff --git a/src/version.c b/src/version.c index bd02fa5bd9..969b874b76 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1022, /**/ 1021, /**/