projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| e98ed9b1 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.167 | |
| 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.167 | |
| 11 | Problem: Xxd crashes when using "xxd -b -c 110". (Debian bug 452789) | |
| 12 | Solution: Allocate more memory. Fix check for maximum number of columns. | |
| 13 | Files: src/xxd/xxd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.166/src/xxd/xxd.c Thu May 10 19:07:42 2007 | |
| 17 | --- src/xxd/xxd.c Thu Nov 29 21:05:16 2007 | |
| 18 | *************** | |
| 19 | *** 212,218 **** | |
| 20 | ||
| 21 | #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */ | |
| 22 | #define COLS 256 /* change here, if you ever need more columns */ | |
| 23 | ! #define LLEN (9 + (5*COLS-1)/2 + 2 + COLS) | |
| 24 | ||
| 25 | char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa; | |
| 26 | ||
| 27 | --- 212,218 ---- | |
| 28 | ||
| 29 | #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */ | |
| 30 | #define COLS 256 /* change here, if you ever need more columns */ | |
| 31 | ! #define LLEN (11 + (9*COLS-1)/1 + COLS + 2) | |
| 32 | ||
| 33 | char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa; | |
| 34 | ||
| 35 | *************** | |
| 36 | *** 590,596 **** | |
| 37 | default: octspergrp = 0; break; | |
| 38 | } | |
| 39 | ||
| 40 | ! if (cols < 1 || (!hextype && (cols > COLS))) | |
| 41 | { | |
| 42 | fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS); | |
| 43 | exit(1); | |
| 44 | --- 590,597 ---- | |
| 45 | default: octspergrp = 0; break; | |
| 46 | } | |
| 47 | ||
| 48 | ! if (cols < 1 || ((hextype == HEX_NORMAL || hextype == HEX_BITS) | |
| 49 | ! && (cols > COLS))) | |
| 50 | { | |
| 51 | fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS); | |
| 52 | exit(1); | |
| 53 | *************** | |
| 54 | *** 750,755 **** | |
| 55 | --- 751,757 ---- | |
| 56 | } | |
| 57 | if (ebcdic) | |
| 58 | e = (e < 64) ? '.' : etoa64[e-64]; | |
| 59 | + /* When changing this update definition of LLEN above. */ | |
| 60 | l[11 + (grplen * cols - 1)/octspergrp + p] = | |
| 61 | #ifdef __MVS__ | |
| 62 | (e >= 64) | |
| 63 | *** ../vim-7.1.166/src/version.c Sat Dec 1 21:12:23 2007 | |
| 64 | --- src/version.c Mon Dec 3 21:30:31 2007 | |
| 65 | *************** | |
| 66 | *** 668,669 **** | |
| 67 | --- 668,671 ---- | |
| 68 | { /* Add new patch number below this line */ | |
| 69 | + /**/ | |
| 70 | + 167, | |
| 71 | /**/ | |
| 72 | ||
| 73 | -- | |
| 74 | hundred-and-one symptoms of being an internet addict: | |
| 75 | 178. You look for an icon to double-click to open your bedroom window. | |
| 76 | ||
| 77 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 78 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 79 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 80 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |