From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 5 Sep 2012 15:28:21 +0000 (+0200)
Subject: updated for version 7.3.652
X-Git-Tag: v7.3.652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac0ddc15e928bb2c9baf256e0cd073770512092f;p=vim

updated for version 7.3.652
Problem:    Workaround for Python crash isn't perfect.
Solution:   Change the type of the length argument. (Sean Estabrooks)
---

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
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    652,
 /**/
     651,
 /**/