r318 - in trunk/vim: debian upstream/patches

[Matthijs Mohlmann]

Author: active2-guest
Date: 2005-09-30 15:00:19 +0000 (Fri, 30 Sep 2005)
New Revision: 318

Added:
   trunk/vim/upstream/patches/6.3.090
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
 * New upstream patch 090


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-09-28 14:09:56 UTC (rev 317)
+++ trunk/vim/debian/README	2005-09-30 15:00:19 UTC (rev 318)
@@ -114,3 +114,4 @@
   1471  6.3.087  Win32: crash when expanding file name when there isn't one
   2269  6.3.088  editing ".in" causes error E218
   2223  6.3.089  session file can't handle current directory with spaces
+  1484  6.3.090  crash with very large value for 'columns' or 'lines'

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-09-28 14:09:56 UTC (rev 317)
+++ trunk/vim/debian/changelog	2005-09-30 15:00:19 UTC (rev 318)
@@ -1,6 +1,6 @@
 vim (1:6.3-089+1) UNRELEASED; urgency=low
 
-  * New upstream patches (087 to 089), see README.gz for details.
+  * New upstream patches (087 to 090), see README.gz for details.
 
   * Norbert Tretkowski <nobse at debian.org>:
     + Updated Standards-Version to 3.6.2 (no changes needed).
@@ -24,7 +24,7 @@
     + Added patch 203_zh_TW.UTF8.po.diff, which fixes a translation
       error in locale zh_TW.UTF-8. (closes: #319420)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Wed, 28 Sep 2005 16:05:09 +0200
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Fri, 30 Sep 2005 16:59:53 +0200
 
 vim (1:6.3-086+1) unstable; urgency=low
 

Added: trunk/vim/upstream/patches/6.3.090
===================================================================
--- trunk/vim/upstream/patches/6.3.090	2005-09-28 14:09:56 UTC (rev 317)
+++ trunk/vim/upstream/patches/6.3.090	2005-09-30 15:00:19 UTC (rev 318)
@@ -0,0 +1,50 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.090
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.090
+Problem:    A very big value for 'columns' or 'lines' may cause a crash.
+Solution:   Limit the values to 10000 and 1000.
+Files:	    src/option.c
+
+
+*** ../vim-6.3.089/src/option.c	Thu Dec 16 12:05:19 2004
+--- src/option.c	Fri Sep 30 15:02:26 2005
+***************
+*** 6821,6826 ****
+--- 6821,6831 ----
+  	}
+  	Columns = MIN_COLUMNS;
+      }
++     /* Limit the values to avoid an overflow in Rows * Columns. */
++     if (Columns > 10000)
++ 	Columns = 10000;
++     if (Rows > 1000)
++ 	Rows = 1000;
+  
+  #ifdef DJGPP
+      /* avoid a crash by checking for a too large value of 'columns' */
+*** ../vim-6.3.089/src/version.c	Wed Sep 28 14:58:09 2005
+--- src/version.c	Fri Sep 30 15:03:19 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     90,
+  /**/
+
+-- 
+It is illegal to rob a bank and then shoot at the bank teller with a water
+pistol.
+		[real standing law in Louisana, United States of America]
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///