diff options
| -rw-r--r-- | src/filepath.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/filepath.c b/src/filepath.c index 01d2dcb97..ef5edae23 100644 --- a/src/filepath.c +++ b/src/filepath.c @@ -1658,7 +1658,8 @@ f_resolve(typval_T *argvars, typval_T *rettv) int limit = 100; p = vim_strsave(p); - + if (p == NULL) + goto fail; if (p[0] == '.' && (vim_ispathsep(p[1]) || (p[1] == '.' && (vim_ispathsep(p[2]))))) is_relative_to_current = TRUE; @@ -1681,7 +1682,10 @@ f_resolve(typval_T *argvars, typval_T *rettv) buf = alloc(MAXPATHL + 1); if (buf == NULL) + { + vim_free(p); goto fail; + } for (;;) { diff --git a/src/version.c b/src/version.c index 3c2c49bd6..9f369a95d 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 */ /**/ + 34, +/**/ 33, /**/ 32, |