projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d034a75d AG |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.373 | |
| 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.373 (after 7.3.366) | |
| 11 | Problem: A tags file with an extremely long name may cause an infinite loop. | |
| 12 | Solution: When encountering a long name switch to linear search. | |
| 13 | Files: src/tag.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.372/src/tag.c 2011-12-08 15:12:08.000000000 +0100 | |
| 17 | --- src/tag.c 2011-12-14 14:13:28.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 1854,1860 **** | |
| 20 | ||
| 21 | if (state == TS_BINARY && orgpat.regmatch.rm_ic && !sortic) | |
| 22 | { | |
| 23 | ! /* binary search won't work for ignoring case, use linear | |
| 24 | * search. */ | |
| 25 | linear = TRUE; | |
| 26 | state = TS_LINEAR; | |
| 27 | --- 1854,1860 ---- | |
| 28 | ||
| 29 | if (state == TS_BINARY && orgpat.regmatch.rm_ic && !sortic) | |
| 30 | { | |
| 31 | ! /* Binary search won't work for ignoring case, use linear | |
| 32 | * search. */ | |
| 33 | linear = TRUE; | |
| 34 | state = TS_LINEAR; | |
| 35 | *************** | |
| 36 | *** 1922,1927 **** | |
| 37 | --- 1922,1940 ---- | |
| 38 | MSG(_("Ignoring long line in tags file")); | |
| 39 | verbose_leave(); | |
| 40 | } | |
| 41 | + #ifdef FEAT_TAG_BINS | |
| 42 | + if (state != TS_LINEAR) | |
| 43 | + { | |
| 44 | + /* Avoid getting stuck. */ | |
| 45 | + linear = TRUE; | |
| 46 | + state = TS_LINEAR; | |
| 47 | + # ifdef HAVE_FSEEKO | |
| 48 | + fseeko(fp, search_info.low_offset, SEEK_SET); | |
| 49 | + # else | |
| 50 | + fseek(fp, (long)search_info.low_offset, SEEK_SET); | |
| 51 | + # endif | |
| 52 | + } | |
| 53 | + #endif | |
| 54 | continue; | |
| 55 | } | |
| 56 | ||
| 57 | *** ../vim-7.3.372/src/version.c 2011-12-08 18:44:47.000000000 +0100 | |
| 58 | --- src/version.c 2011-12-14 14:12:06.000000000 +0100 | |
| 59 | *************** | |
| 60 | *** 716,717 **** | |
| 61 | --- 716,719 ---- | |
| 62 | { /* Add new patch number below this line */ | |
| 63 | + /**/ | |
| 64 | + 373, | |
| 65 | /**/ | |
| 66 | ||
| 67 | -- | |
| 68 | ZOOT: I'm afraid our life must seem very dull and quiet compared to yours. | |
| 69 | We are but eightscore young blondes, all between sixteen and | |
| 70 | nineteen-and-a-half, cut off in this castle, with no one to protect us. | |
| 71 | Oooh. It is a lonely life ... bathing ... dressing ... undressing ... | |
| 72 | making exciting underwear.... | |
| 73 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 74 | ||
| 75 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 76 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 77 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 78 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |