diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-05 20:34:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-05 20:34:15 +0200 |
| commit | 45b0ca189a0107ea99fe0ec325494da738a3c588 (patch) | |
| tree | 6d4e241dda353399838c11701511cd373977829f | |
| parent | 4f701326df124682567c95af9bd6e3417a9fb5c4 (diff) | |
| download | vim-45b0ca189a0107ea99fe0ec325494da738a3c588.tar.gz | |
Problem: Python: Crash on MS-Windows when os.fchdir() is not available.
Solution: Check for _chdir to be NULL. (Ken Takata)
| -rw-r--r-- | src/if_py_both.h | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 945efe60..ae2c6bc9 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -718,6 +718,8 @@ _VimChdir(PyObject *_chdir, PyObject *args, PyObject *kwargs) PyObject *todecref; char_u *new_dir; + if (_chdir == NULL) + return NULL; if (!(r = PyObject_Call(_chdir, args, kwargs))) return NULL; diff --git a/src/version.c b/src/version.c index cfe0b22b..40f3df86 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1124, +/**/ 1123, /**/ 1122, |