diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-10-14 03:41:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-10-14 03:41:59 +0200 |
| commit | ee0646da40374df443c8c870c2e30208db1995e8 (patch) | |
| tree | 26d4eafcbfe350bc2e6855e0869d040a1e11f1e1 | |
| parent | 385add2d2215284346e373698ffd5614a7e46bad (diff) | |
| download | vim-ee0646da40374df443c8c870c2e30208db1995e8.tar.gz | |
Problem: MzScheme and Lua may use a NULL string.
Solution: Use an empty string instead of NULL. (Yukihiro Nakadaira)
| -rw-r--r-- | src/if_lua.c | 3 | ||||
| -rw-r--r-- | src/if_mzsch.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/if_lua.c b/src/if_lua.c index e873b6bf..ce65fd2f 100644 --- a/src/if_lua.c +++ b/src/if_lua.c @@ -464,7 +464,8 @@ luaV_pushtypval(lua_State *L, typval_T *tv) switch (tv->v_type) { case VAR_STRING: - lua_pushstring(L, (char *) tv->vval.v_string); + lua_pushstring(L, tv->vval.v_string == NULL + ? "" : (char *)tv->vval.v_string); break; case VAR_NUMBER: lua_pushinteger(L, (int) tv->vval.v_number); diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 86e96bd3..d6ee4b9c 100644 --- a/src/if_mzsch.c +++ b/src/if_mzsch.c @@ -2649,7 +2649,8 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited) new_value = FALSE; else if (vim_value->v_type == VAR_STRING) { - result = scheme_make_string((char *)vim_value->vval.v_string); + result = scheme_make_string(vim_value->vval.v_string == NULL + ? "" : (char *)vim_value->vval.v_string); MZ_GC_CHECK(); } else if (vim_value->v_type == VAR_NUMBER) diff --git a/src/version.c b/src/version.c index d512955f..0ea098b9 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 */ /**/ + 689, +/**/ 688, /**/ 687, |