summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-05 20:34:15 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-05 20:34:15 +0200
commitd4209d203ac77e8c9debcc152557d80b4357aaae (patch)
tree686e17bb593a822d06b20d83d0e27469738aa0eb
parente60c2e5e1c8df565076c392c3052c34078fda777 (diff)
updated for version 7.3.1124v7.3.1124
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.h2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 945efe60b6..ae2c6bc968 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 cfe0b22bf4..40f3df8617 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,