updated for version 7.3.689

Problem:    MzScheme and Lua may use a NULL string.
Solution:   Use an empty string instead of NULL. (Yukihiro Nakadaira)

diff --git a/src/if_lua.c b/src/if_lua.c
index e873b6bf7792c695d27db17207a5739d887aa8a4..ce65fd2f68794bb53771400edd739fa55bf33b58 100644 (file)
--- 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 86e96bd335952ccd24e6e82b4590e8d6e8d97077..d6ee4b9c5a0717bce2f87c58815698970ae70eb6 100644 (file)
--- 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 d512955faba31b1ce748c31329dedda6724a0a19..0ea098b92efe462710d9570ffeea895b0e4ac002 100644 (file)
--- 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 */
+/**/
+    689,
 /**/
     688,
 /**/