r1098 - in /trunk/packages/vim: debian/changelog patches/series patches/xxd.c-large_columns.diff

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Nov 28 16:01:37 UTC 2007


Author: jamessan
Date: Wed Nov 28 16:01:37 2007
New Revision: 1098

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1098
Log:
* Add xxd.c-large_columns.diff, which fixes a segfault that occus in xxd
  when called with a large -c argument.  (Closes: #452789)

Added:
    trunk/packages/vim/patches/xxd.c-large_columns.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1098&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Nov 28 16:01:37 2007
@@ -63,8 +63,10 @@
   * debian/control:
     - Remove Norbert Tretowski from Uploaders with his permission.  Thanks for
       all your work.
-
- -- James Vega <jamessan at debian.org>  Tue, 27 Nov 2007 00:57:05 -0500
+  * Add xxd.c-large_columns.diff, which fixes a segfault that occus in xxd
+    when called with a large -c argument.  (Closes: #452789)
+
+ -- James Vega <jamessan at debian.org>  Wed, 28 Nov 2007 11:00:36 -0500
 
 vim (1:7.1-138+1) unstable; urgency=medium
 

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1098&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Wed Nov 28 16:01:37 2007
@@ -26,3 +26,4 @@
 lhaskell.vim-syntax.diff -p0
 fstab.vim-syntax.diff -p0
 filetype.vim-debfiles.diff -p0
+xxd.c-large_columns.diff -p0

Added: trunk/packages/vim/patches/xxd.c-large_columns.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/xxd.c-large_columns.diff?rev=1098&op=file
==============================================================================
--- trunk/packages/vim/patches/xxd.c-large_columns.diff (added)
+++ trunk/packages/vim/patches/xxd.c-large_columns.diff Wed Nov 28 16:01:37 2007
@@ -1,0 +1,23 @@
+Index: vim/src/xxd/xxd.c
+===================================================================
+--- vim/src/xxd/xxd.c.orig
++++ vim/src/xxd/xxd.c
+@@ -212,7 +212,7 @@
+ 
+ #define TRY_SEEK	/* attempt to use lseek, or skip forward by reading */
+ #define COLS 256	/* change here, if you ever need more columns */
+-#define LLEN (9 + (5*COLS-1)/2 + 2 + COLS)
++#define LLEN (9 + (9*COLS-1)/2 + 2 + COLS)
+ 
+ char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa;
+ 
+@@ -590,7 +590,8 @@
+       default:			octspergrp = 0; break;
+       }
+ 
+-  if (cols < 1 || (!hextype && (cols > COLS)))
++  if (cols < 1 || ((hextype == HEX_NORMAL || hextype == HEX_BITS)
++                                                          && (cols > COLS)))
+     {
+       fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS);
+       exit(1);




More information about the pkg-vim-maintainers mailing list