projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.120 | |
| 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.0.120 | |
| 11 | Problem: Crash when using CTRL-R = at the command line and entering | |
| 12 | "getreg('=')". (James Vega) | |
| 13 | Solution: Avoid recursiveness of evaluating the = register. | |
| 14 | Files: src/ops.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.119/src/ops.c Sun Jul 23 22:37:29 2006 | |
| 18 | --- src/ops.c Fri Oct 6 21:27:40 2006 | |
| 19 | *************** | |
| 20 | *** 770,775 **** | |
| 21 | --- 770,776 ---- | |
| 22 | { | |
| 23 | char_u *expr_copy; | |
| 24 | char_u *rv; | |
| 25 | + static int nested = 0; | |
| 26 | ||
| 27 | if (expr_line == NULL) | |
| 28 | return NULL; | |
| 29 | *************** | |
| 30 | *** 780,786 **** | |
| 31 | --- 781,794 ---- | |
| 32 | if (expr_copy == NULL) | |
| 33 | return NULL; | |
| 34 | ||
| 35 | + /* When we are invoked recursively limit the evaluation to 10 levels. | |
| 36 | + * Then return the string as-is. */ | |
| 37 | + if (nested >= 10) | |
| 38 | + return expr_copy; | |
| 39 | + | |
| 40 | + ++nested; | |
| 41 | rv = eval_to_string(expr_copy, NULL, TRUE); | |
| 42 | + --nested; | |
| 43 | vim_free(expr_copy); | |
| 44 | return rv; | |
| 45 | } | |
| 46 | *** ../vim-7.0.119/src/version.c Fri Oct 6 20:39:58 2006 | |
| 47 | --- src/version.c Fri Oct 6 21:31:56 2006 | |
| 48 | *************** | |
| 49 | *** 668,669 **** | |
| 50 | --- 668,671 ---- | |
| 51 | { /* Add new patch number below this line */ | |
| 52 | + /**/ | |
| 53 | + 120, | |
| 54 | /**/ | |
| 55 | ||
| 56 | -- | |
| 57 | hundred-and-one symptoms of being an internet addict: | |
| 58 | 16. You step out of your room and realize that your parents have moved and | |
| 59 | you don't have a clue when it happened. | |
| 60 | ||
| 61 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 62 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 63 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 64 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |