patch 8.0.1666: % argument in ch_log() causes trouble

Problem:    % argument in ch_log() causes trouble.
Solution:   Use string as third argument in internal ch_log(). (Dominique
            Pelle, closes #2784)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index dc2c14c3def0be7b4515d0f3938fc2df72857a19..1ffbb21fa1669e4115ceeb8332277d100984aae8 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -1993,7 +1993,7 @@ f_ch_log(typval_T *argvars, typval_T *rettv UNUSED)
     if (argvars[1].v_type != VAR_UNKNOWN)
        channel = get_channel_arg(&argvars[1], FALSE, FALSE, 0);
 
-    ch_log(channel, (char *)msg);
+    ch_log(channel, "%s", msg);
 }
 
 /*
@@ -12927,7 +12927,7 @@ get_callback(typval_T *arg, partial_T **pp)
 }
 
 /*
- * Unref/free "callback" and "partial" retured by get_callback().
+ * Unref/free "callback" and "partial" returned by get_callback().
  */
     void
 free_callback(char_u *callback, partial_T *partial)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 9de3ca01f9a1a88862f48699998c2abb1d22d167..59283d2723f7c36ba5db0d83c818da817d15d824 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1823,3 +1823,15 @@ func Test_list_args()
   call s:test_list_args('print("hello\"world\"")', 'hello"world"', 1)
   call s:test_list_args('print("hello\tworld")', "hello\tworld", 1)
 endfunc
+
+" Do this last, it stops any channel log.
+func Test_zz_ch_log()
+  call ch_logfile('Xlog', 'w')
+  call ch_log('hello there')
+  call ch_log('%s%s')
+  call ch_logfile('')
+  let text = readfile('Xlog')
+  call assert_match("hello there", text[1])
+  call assert_match("%s%s", text[2])
+  call delete('Xlog')
+endfunc

diff --git a/src/version.c b/src/version.c
index b29d64c82536f0521fc52780e23a9abd3d9c56aa..44fb030fc96e4700825be8b658dd18812c8002aa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1666,
 /**/
     1665,
 /**/