diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-04-20 13:31:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-04-20 13:31:21 +0200 |
| commit | b830f0c7df8f98a648d1b45aabae78b0367da346 (patch) | |
| tree | f71c66eaef2faa6df0d024d3fe66d62bf4adcafd /src | |
| parent | 53bfca22f1f67934defa5f9c62ae5a6d5cf9f198 (diff) | |
| download | vim-b830f0c7df8f98a648d1b45aabae78b0367da346.zip | |
updated for version 7.3.497
Problem: Crash when doing ":python print" and compiled with gcc and
the optimizer enabled.
Solution: Avoid the crash, doesn't really fix the problem. (Christian
Brabandt)
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_py_both.h | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index aa2591267..cbfbaa767 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -77,6 +77,11 @@ OutputWrite(PyObject *self, PyObject *args) 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 c0d60e8aa..b2f26a9ba 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 497, +/**/ 496, /**/ 495, |