diff options
author | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
commit | b8c33ee22e78f48f52bfde7328d20efe73493149 (patch) | |
tree | af5a3a56a5094facb1c00472c0b1a3be7478eca2 /vim/vim-7.2/7.2.297 | |
parent | 9c7f68c9ab1ed52a5c4c2cec57c71b15d2209f52 (diff) | |
parent | 34e8f8d7edc734b88753ff7cb0443f8489b02ee8 (diff) | |
download | aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.gz aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'vim/vim-7.2/7.2.297')
-rw-r--r-- | vim/vim-7.2/7.2.297 | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/vim/vim-7.2/7.2.297 b/vim/vim-7.2/7.2.297 deleted file mode 100644 index cc8d789..0000000 --- a/vim/vim-7.2/7.2.297 +++ /dev/null @@ -1,70 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.297 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.297 -Problem: Reading freed memory when writing ":reg" output to a register. - (Dominique Pelle) -Solution: Skip the register being written to. -Files: src/ops.c - - -*** ../vim-7.2.296/src/ops.c 2009-11-11 17:22:30.000000000 +0100 ---- src/ops.c 2009-11-11 19:30:47.000000000 +0100 -*************** -*** 3991,3996 **** ---- 3991,4004 ---- - } - else - yb = &(y_regs[i]); -+ -+ #ifdef FEAT_EVAL -+ if (name == MB_TOLOWER(redir_reg) -+ || (redir_reg == '"' && yb == y_previous)) -+ continue; /* do not list register being written to, the -+ * pointer can be freed */ -+ #endif -+ - if (yb->y_array != NULL) - { - msg_putchar('\n'); -*************** -*** 6090,6096 **** - long maxlen; - #endif - -! if (y_ptr->y_array == NULL) /* NULL means emtpy register */ - y_ptr->y_size = 0; - - /* ---- 6098,6104 ---- - long maxlen; - #endif - -! if (y_ptr->y_array == NULL) /* NULL means empty register */ - y_ptr->y_size = 0; - - /* -*** ../vim-7.2.296/src/version.c 2009-11-17 12:31:30.000000000 +0100 ---- src/version.c 2009-11-17 12:42:28.000000000 +0100 -*************** -*** 683,684 **** ---- 683,686 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 297, - /**/ - --- -"Beware of bugs in the above code; I have only proved -it correct, not tried it." -- Donald Knuth - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |