# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1458768607 -3600
# Node ID 8af6e33e4d4c7f63906f7ba3f14f6833f2a88316
# Parent  5b56d1038729af72667baf1fc9e31446c0b2d4a5
commit https://github.com/vim/vim/commit/5ca84ce4aa2832041f843e624c222bbc1f4d3e14
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 23 22:28:25 2016 +0100

    patch 7.4.1641
    Problem:    Using unterminated string.
    Solution:   Add NUL before calling vim_strsave_shellescape(). (James McCoy)

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -26439,6 +26439,8 @@ repeat:
 
     if (src[*usedlen] == ':' && src[*usedlen + 1] == 'S')
     {
+	/* vim_strsave_shellescape() needs a NUL terminated string. */
+	(*fnamep)[*fnamelen] = NUL;
 	p = vim_strsave_shellescape(*fnamep, FALSE, FALSE);
 	if (p == NULL)
 	    return -1;
diff --git a/src/testdir/test105.in b/src/testdir/test105.in
--- a/src/testdir/test105.in
+++ b/src/testdir/test105.in
@@ -35,6 +35,7 @@ STARTTEST
 :Put fnamemodify('abc'' ''def',    ':S'      )
 :Put fnamemodify('abc''%''def',    ':S'      )
 :Put fnamemodify("abc\ndef",       ':S'      )
+:Put expand('%:r:S') == shellescape(expand('%:r'))
 :set shell=tcsh
 :Put fnamemodify("abc\ndef",       ':S'      )
 :$put ='vim: ts=8'
diff --git a/src/testdir/test105.ok b/src/testdir/test105.ok
--- a/src/testdir/test105.ok
+++ b/src/testdir/test105.ok
@@ -25,5 +25,6 @@ fnamemodify('abc"%"def',      ':S'      
 fnamemodify('abc'' ''def',    ':S'      )	'''abc''\'''' ''\''''def'''
 fnamemodify('abc''%''def',    ':S'      )	'''abc''\''''%''\''''def'''
 fnamemodify("abc\ndef",       ':S'      )	'''abc^@def'''
+expand('%:r:S') == shellescape(expand('%:r'))	1
 fnamemodify("abc\ndef",       ':S'      )	'''abc\^@def'''
 vim: ts=8
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1641,
+/**/
     1640,
 /**/
     1639,