diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-09-05 17:28:21 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-09-05 17:28:21 +0200 |
commit | ac0ddc15e928bb2c9baf256e0cd073770512092f (patch) | |
tree | 08b498bf7dc095a86eb7cb4f1e2f1d6b4268ee73 | |
parent | 7c0a86b1e871a9546387252b5a33594fc17487aa (diff) | |
download | vim-git-ac0ddc15e928bb2c9baf256e0cd073770512092f.tar.gz |
updated for version 7.3.652v7.3.652
Problem: Workaround for Python crash isn't perfect.
Solution: Change the type of the length argument. (Sean Estabrooks)
-rw-r--r-- | src/if_py_both.h | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 60375d116..931ecb98a 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -74,18 +74,13 @@ static struct PyMethodDef OutputMethods[] = { static PyObject * OutputWrite(PyObject *self, PyObject *args) { - int len; + Py_ssize_t len; char *str = NULL; int error = ((OutputObject *)(self))->error; if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len)) return NULL; - /* TODO: This works around a gcc optimizer problem and avoids Vim - * from crashing. Should find a real solution. */ - if (str == NULL) - return NULL; - Py_BEGIN_ALLOW_THREADS Python_Lock_Vim(); writer((writefn)(error ? emsg : msg), (char_u *)str, len); diff --git a/src/version.c b/src/version.c index 6afaf8d31..37791e6a8 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 652, +/**/ 651, /**/ 650, |