commit e0c6a656f37b028e4e80b25fb236095d98451483
author Bram Moolenaar <Bram@vim.org> Sun Jun 06 23:10:19 2010 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jun 06 23:10:19 2010 +0200
tree 5271aca03ed8b2db61c2e5bbc023c83e5ba82994
parent 9d6650f6c443985a83df3b3415eb42137e613f1f

Fix crash for ":ownsyntax". (Dominique Pelle)

src/syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index 0388209..7d96feb 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6198,10 +6198,13 @@
 
     /* move value of b:current_syntax to w:current_syntax */
     new_value = get_var_value((char_u *)"b:current_syntax");
-    set_internal_string_var((char_u *)"w:current_syntax", new_value);
+    if (new_value != NULL)
+	set_internal_string_var((char_u *)"w:current_syntax", new_value);
 
     /* restore value of b:current_syntax */
-    if (old_value != NULL)
+    if (old_value == NULL)
+	do_unlet((char_u *)"b:current_syntax", TRUE);
+    else
     {
 	set_internal_string_var((char_u *)"b:current_syntax", old_value);
 	vim_free(old_value);