To: vim_dev@googlegroups.com Subject: Patch 8.0.1746 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1746 Problem: MS-Windows: channel tests fail. Solution: Make a copy of the command before splitting it. Files: src/channel.c *** ../vim-8.0.1745/src/channel.c 2018-04-21 22:30:04.708058436 +0200 --- src/channel.c 2018-04-21 22:54:49.291381589 +0200 *************** *** 5563,5568 **** --- 5563,5570 ---- #endif if (argvars[0].v_type == VAR_STRING) { + char_u *cmd_copy; + /* Command is a string. */ cmd = argvars[0].vval.v_string; if (cmd == NULL || *cmd == NUL) *************** *** 5570,5581 **** EMSG(_(e_invarg)); goto theend; } ! /* This will modify "cmd". */ ! if (mch_parse_cmd(cmd, FALSE, &argv, &argc) == FAIL) goto theend; for (i = 0; i < argc; i++) argv[i] = (char *)vim_strsave((char_u *)argv[i]); argv[argc] = NULL; } else if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL --- 5572,5589 ---- EMSG(_(e_invarg)); goto theend; } ! /* Make a copy, parsing will modify "cmd". */ ! cmd_copy = vim_strsave(cmd); ! if (cmd_copy == NULL ! || mch_parse_cmd(cmd_copy, FALSE, &argv, &argc) == FAIL) ! { ! vim_free(cmd_copy); goto theend; + } for (i = 0; i < argc; i++) argv[i] = (char *)vim_strsave((char_u *)argv[i]); argv[argc] = NULL; + vim_free(cmd_copy); } else if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL *** ../vim-8.0.1745/src/version.c 2018-04-21 22:30:04.712058412 +0200 --- src/version.c 2018-04-21 23:00:13.921491903 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1746, /**/ -- hundred-and-one symptoms of being an internet addict: 243. You unsuccessfully try to download a pizza from www.dominos.com. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///