[packages/vim.git] / 6.2.037

To: vim-dev@vim.org
Subject: Patch 6.2.037
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 6.2.037
Problem:    Win32: converting an encoding name to a codepage could result in
	    an arbitrary number.
Solution:   make encname2codepage() return zero if the encoding name doesn't
	    contain a codepage number.
Files:	    src/mbyte.c


*** ../vim-6.2.036/src/mbyte.c	Tue Jun  3 21:09:52 2003
--- src/mbyte.c	Sun Jun 22 17:05:41 2003
***************
*** 2773,2778 ****
--- 2773,2780 ----
  	cp = atoi(p + 2);
      else if ((idx = enc_canon_search(p)) >= 0)
  	cp = enc_canon_table[idx].codepage;
+     else
+ 	return 0;
      if (IsValidCodePage(cp))
  	return cp;
      return 0;
*** ../vim-6.2.036/src/version.c	Fri Jul 25 22:30:18 2003
--- src/version.c	Fri Jul 25 22:33:47 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     37,
  /**/

-- 
CART DRIVER: Bring out your dead!
   There are legs stick out of windows and doors.  Two MEN are fighting in the
   mud - covered from head to foot in it.  Another MAN is on his hands in
   knees shovelling mud into his mouth.  We just catch sight of a MAN falling
   into a well.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///
Commit	Line	Data
d8621708	1	To: vim-dev@vim.org
	2	Subject: Patch 6.2.037
	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 6.2.037
	11	Problem: Win32: converting an encoding name to a codepage could result in
	12	an arbitrary number.
	13	Solution: make encname2codepage() return zero if the encoding name doesn't
	14	contain a codepage number.
	15	Files: src/mbyte.c
	16
	17
	18	*** ../vim-6.2.036/src/mbyte.c Tue Jun 3 21:09:52 2003
	19	--- src/mbyte.c Sun Jun 22 17:05:41 2003
	20	***************
	21	* 2773,2778 **
	22	--- 2773,2780 ----
	23	cp = atoi(p + 2);
	24	else if ((idx = enc_canon_search(p)) >= 0)
	25	cp = enc_canon_table[idx].codepage;
	26	+ else
	27	+ return 0;
	28	if (IsValidCodePage(cp))
	29	return cp;
	30	return 0;
	31	*** ../vim-6.2.036/src/version.c Fri Jul 25 22:30:18 2003
	32	--- src/version.c Fri Jul 25 22:33:47 2003
	33	***************
	34	* 632,633 **
	35	--- 632,635 ----
	36	{ /* Add new patch number below this line */
	37	+ /**/
	38	+ 37,
	39	/**/
	40
	41	--
	42	CART DRIVER: Bring out your dead!
	43	There are legs stick out of windows and doors. Two MEN are fighting in the
	44	mud - covered from head to foot in it. Another MAN is on his hands in
	45	knees shovelling mud into his mouth. We just catch sight of a MAN falling
	46	into a well.
	47	"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
	48
	49	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
	50	/// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
	51	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
	52	\\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///