[packages/vim.git] / 7.1.156

To: vim-dev@vim.org
Subject: Patch 7.1.156
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 7.1.156
Problem:    Overlapping arguments for strcpy() when expanding command line
	    variables.
Solution:   Use mch_memmove() instead of STRCPY().  Also fix a few typos.
	    (Dominique Pelle)
Files:	    src/ex_docmd.c


*** ../vim-7.1.155/src/ex_docmd.c	Fri Oct 19 16:20:09 2007
--- src/ex_docmd.c	Sat Nov 10 12:39:51 2007
***************
*** 666,672 ****
  		if (ex_pressedreturn)
  		{
  		    /* go up one line, to overwrite the ":<CR>" line, so the
! 		     * output doensn't contain empty lines. */
  		    msg_row = prev_msg_row;
  		    if (prev_msg_row == Rows - 1)
  			msg_row--;
--- 666,672 ----
  		if (ex_pressedreturn)
  		{
  		    /* go up one line, to overwrite the ":<CR>" line, so the
! 		     * output doesn't contain empty lines. */
  		    msg_row = prev_msg_row;
  		    if (prev_msg_row == Rows - 1)
  			msg_row--;
***************
*** 2760,2766 ****
  
      /*
       * Isolate the command and search for it in the command table.
!      * Exeptions:
       * - the 'k' command can directly be followed by any character.
       * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
       *	    but :sre[wind] is another command, as are :scrip[tnames],
--- 2760,2766 ----
  
      /*
       * Isolate the command and search for it in the command table.
!      * Exceptions:
       * - the 'k' command can directly be followed by any character.
       * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
       *	    but :sre[wind] is another command, as are :scrip[tnames],
***************
*** 6677,6683 ****
   * The list should be allocated using alloc(), as should each item in the
   * list. This function takes over responsibility for freeing the list.
   *
!  * XXX The list is made into the arggument list. This is freed using
   * FreeWild(), which does a series of vim_free() calls, unless the two defines
   * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
   * routine _fnexplodefree() is used. This may cause problems, but as the drop
--- 6677,6683 ----
   * The list should be allocated using alloc(), as should each item in the
   * list. This function takes over responsibility for freeing the list.
   *
!  * XXX The list is made into the argument list. This is freed using
   * FreeWild(), which does a series of vim_free() calls, unless the two defines
   * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
   * routine _fnexplodefree() is used. This may cause problems, but as the drop
***************
*** 7795,7801 ****
  	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
  							     && !eap->forceit)
  	{
! 	    EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)"));
  	    return;
  	}
  
--- 7795,7801 ----
  	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
  							     && !eap->forceit)
  	{
! 	    EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
  	    return;
  	}
  
***************
*** 9391,9397 ****
      if (src > srcstart && src[-1] == '\\')
      {
  	*usedlen = 0;
! 	STRCPY(src - 1, src);		/* remove backslash */
  	return NULL;
      }
  
--- 9391,9397 ----
      if (src > srcstart && src[-1] == '\\')
      {
  	*usedlen = 0;
! 	mch_memmove(src - 1, src, STRLEN(src) + 1);	/* remove backslash */
  	return NULL;
      }
  
*** ../vim-7.1.155/src/version.c	Sat Nov 10 22:50:20 2007
--- src/version.c	Sun Nov 11 19:15:51 2007
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     156,
  /**/

-- 
Common sense is what tells you that the world is flat.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\        download, build and distribute -- http://www.A-A-P.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
Commit	Line	Data
e98ed9b1 ER	1	To: vim-dev@vim.org
	2	Subject: Patch 7.1.156
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.1.156
	11	Problem: Overlapping arguments for strcpy() when expanding command line
	12	variables.
	13	Solution: Use mch_memmove() instead of STRCPY(). Also fix a few typos.
	14	(Dominique Pelle)
	15	Files: src/ex_docmd.c
	16
	17
	18	*** ../vim-7.1.155/src/ex_docmd.c Fri Oct 19 16:20:09 2007
	19	--- src/ex_docmd.c Sat Nov 10 12:39:51 2007
	20	***************
	21	* 666,672 **
	22	if (ex_pressedreturn)
	23	{
	24	/* go up one line, to overwrite the ":<CR>" line, so the
	25	! * output doensn't contain empty lines. */
	26	msg_row = prev_msg_row;
	27	if (prev_msg_row == Rows - 1)
	28	msg_row--;
	29	--- 666,672 ----
	30	if (ex_pressedreturn)
	31	{
	32	/* go up one line, to overwrite the ":<CR>" line, so the
	33	! * output doesn't contain empty lines. */
	34	msg_row = prev_msg_row;
	35	if (prev_msg_row == Rows - 1)
	36	msg_row--;
	37	***************
	38	* 2760,2766 **
	39
	40	/*
	41	* Isolate the command and search for it in the command table.
	42	! * Exeptions:
	43	* - the 'k' command can directly be followed by any character.
	44	* - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
	45	* but :sre[wind] is another command, as are :scrip[tnames],
	46	--- 2760,2766 ----
	47
	48	/*
	49	* Isolate the command and search for it in the command table.
	50	! * Exceptions:
	51	* - the 'k' command can directly be followed by any character.
	52	* - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
	53	* but :sre[wind] is another command, as are :scrip[tnames],
	54	***************
	55	* 6677,6683 **
	56	* The list should be allocated using alloc(), as should each item in the
	57	* list. This function takes over responsibility for freeing the list.
	58	*
	59	! * XXX The list is made into the arggument list. This is freed using
	60	* FreeWild(), which does a series of vim_free() calls, unless the two defines
	61	* __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
	62	* routine _fnexplodefree() is used. This may cause problems, but as the drop
	63	--- 6677,6683 ----
	64	* The list should be allocated using alloc(), as should each item in the
65	* list. This function takes over responsibility for freeing the list.
66	*
67	! * XXX The list is made into the argument list. This is freed using
68	* FreeWild(), which does a series of vim_free() calls, unless the two defines
69	* __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
70	* routine _fnexplodefree() is used. This may cause problems, but as the drop
71	***************
72	* 7795,7801 **
73	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
74	&& !eap->forceit)
75	{
76	! EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)"));
77	return;
78	}
79
80	--- 7795,7801 ----
81	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
82	&& !eap->forceit)
83	{
84	! EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
85	return;
86	}
87
88	***************
89	* 9391,9397 **
90	if (src > srcstart && src[-1] == '\\')
91	{
92	*usedlen = 0;
93	! STRCPY(src - 1, src); /* remove backslash */
94	return NULL;
95	}
96
97	--- 9391,9397 ----
98	if (src > srcstart && src[-1] == '\\')
99	{
100	*usedlen = 0;
101	! mch_memmove(src - 1, src, STRLEN(src) + 1); /* remove backslash */
102	return NULL;
103	}
104
105	*** ../vim-7.1.155/src/version.c Sat Nov 10 22:50:20 2007
106	--- src/version.c Sun Nov 11 19:15:51 2007
107	***************
108	* 668,669 **
109	--- 668,671 ----
110	{ /* Add new patch number below this line */
111	+ /**/
112	+ 156,
113	/**/
114
115	--
116	Common sense is what tells you that the world is flat.
117
118	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
119	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
120	\\\ download, build and distribute -- http://www.A-A-P.org ///
121	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///