projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ae497238 AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.366 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.366 | |
| 11 | Problem: A tags file with an extremely long name causes errors. | |
| 12 | Solution: Ignore tags that are too long. (Arno Renevier) | |
| 13 | Files: src/tag.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.365/src/tag.c 2011-10-12 19:53:31.000000000 +0200 | |
| 17 | --- src/tag.c 2011-12-08 13:32:51.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 1906,1917 **** | |
| 20 | tagp.tagname = lbuf; | |
| 21 | #ifdef FEAT_TAG_ANYWHITE | |
| 22 | tagp.tagname_end = skiptowhite(lbuf); | |
| 23 | ! if (*tagp.tagname_end == NUL) /* corrupted tag line */ | |
| 24 | #else | |
| 25 | tagp.tagname_end = vim_strchr(lbuf, TAB); | |
| 26 | ! if (tagp.tagname_end == NULL) /* corrupted tag line */ | |
| 27 | #endif | |
| 28 | { | |
| 29 | line_error = TRUE; | |
| 30 | break; | |
| 31 | } | |
| 32 | --- 1906,1931 ---- | |
| 33 | tagp.tagname = lbuf; | |
| 34 | #ifdef FEAT_TAG_ANYWHITE | |
| 35 | tagp.tagname_end = skiptowhite(lbuf); | |
| 36 | ! if (*tagp.tagname_end == NUL) | |
| 37 | #else | |
| 38 | tagp.tagname_end = vim_strchr(lbuf, TAB); | |
| 39 | ! if (tagp.tagname_end == NULL) | |
| 40 | #endif | |
| 41 | { | |
| 42 | + if (vim_strchr(lbuf, NL) == NULL) | |
| 43 | + { | |
| 44 | + /* Truncated line, ignore it. Has been reported for | |
| 45 | + * Mozilla JS with extremely long names. */ | |
| 46 | + if (p_verbose >= 5) | |
| 47 | + { | |
| 48 | + verbose_enter(); | |
| 49 | + MSG(_("Ignoring long line in tags file")); | |
| 50 | + verbose_leave(); | |
| 51 | + } | |
| 52 | + continue; | |
| 53 | + } | |
| 54 | + | |
| 55 | + /* Corrupted tag line. */ | |
| 56 | line_error = TRUE; | |
| 57 | break; | |
| 58 | } | |
| 59 | *** ../vim-7.3.365/src/version.c 2011-12-08 15:09:46.000000000 +0100 | |
| 60 | --- src/version.c 2011-12-08 15:11:10.000000000 +0100 | |
| 61 | *************** | |
| 62 | *** 716,717 **** | |
| 63 | --- 716,719 ---- | |
| 64 | { /* Add new patch number below this line */ | |
| 65 | + /**/ | |
| 66 | + 366, | |
| 67 | /**/ | |
| 68 | ||
| 69 | -- | |
| 70 | hundred-and-one symptoms of being an internet addict: | |
| 71 | 246. You use up your free 100 hours in less than a week. | |
| 72 | ||
| 73 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 74 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 75 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 76 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |