aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.3.689

Browse Source 
Problem:    MzScheme and Lua may use a NULL string.
Solution:   Use an empty string instead of NULL. (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar
2012-10-14 03:41:59 +02:00
parent 7bc4f93c07
commit d04da7cb4a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/if_lua.c
View File

@@ -464,7 +464,8 @@ luaV_pushtypval(lua_State *L, typval_T *tv)
switch (tv->v_type) switch (tv->v_type)
{ {
case VAR_STRING: 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; break;
case VAR_NUMBER: case VAR_NUMBER:
lua_pushinteger(L, (int) tv->vval.v_number); lua_pushinteger(L, (int) tv->vval.v_number);

3
src/if_mzsch.c
View File

@@ -2649,7 +2649,8 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
new_value = FALSE; new_value = FALSE;
else if (vim_value->v_type == VAR_STRING) 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(); MZ_GC_CHECK();
} }
else if (vim_value->v_type == VAR_NUMBER) else if (vim_value->v_type == VAR_NUMBER)

2
src/version.c
View File

@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
689,
/**/ /**/
688, 688,
/**/ /**/