rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- patchlevel 438

Browse Source
This commit is contained in:
Karsten Hopp 2010-05-25 22:10:26 +00:00
parent 67a281bb7b
commit 9941f6de81
3 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
7.2.438 Normal file
View File

@ -0,0 +1,74 @@
To: vim-dev@vim.org
Subject: Patch 7.2.438
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.438 (after 7.2.427)
Problem: "vim -r" crashes.
Solution: Don't use NULL pointer argument.
Files: src/memline.c
*** ../vim-7.2.437/src/memline.c 2010-05-14 17:52:35.000000000 +0200
--- src/memline.c 2010-05-25 21:36:01.000000000 +0200
***************
*** 1404,1418 ****
int i;
char_u *dirp;
char_u *dir_name;
! char_u *fname_res = *fname;
#ifdef HAVE_READLINK
char_u fname_buf[MAXPATHL];
/* Expand symlink in the file name, because the swap file is created with
* the actual file instead of with the symlink. */
if (resolve_symlink(*fname, fname_buf) == OK)
fname_res = fname_buf;
#endif
if (list)
{
--- 1404,1425 ----
int i;
char_u *dirp;
char_u *dir_name;
! char_u *fname_res = NULL;
#ifdef HAVE_READLINK
char_u fname_buf[MAXPATHL];
+ #endif
+ if (fname != NULL)
+ {
+ #ifdef HAVE_READLINK
/* Expand symlink in the file name, because the swap file is created with
* the actual file instead of with the symlink. */
if (resolve_symlink(*fname, fname_buf) == OK)
fname_res = fname_buf;
+ else
#endif
+ fname_res = *fname;
+ }
if (list)
{
*** ../vim-7.2.437/src/version.c 2010-05-21 13:08:51.000000000 +0200
--- src/version.c 2010-05-25 21:30:12.000000000 +0200
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 438,
/**/
--
A fool learns from his mistakes, a wise man from someone else's.
/// 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 ///

1
README.patches
View File

@ -469,3 +469,4 @@ Individual patches for Vim 7.2:
4590 7.2.435 (after 7.2.430) crash when using bad_char_idx uninitialized
4058 7.2.436 reproducible crash in syntax HL
1605 7.2.437 (after 7.2.407) no line break for "\\\n" in expression of :s
2045 7.2.438 (after 7.2.427) "vim -r" crashes

7
vim.spec
View File

@ -18,7 +18,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
%define patchlevel 437
%define patchlevel 438
Summary: The VIM editor
URL: http://www.vim.org/
@ -503,6 +503,7 @@ Patch434: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.434
Patch435: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.435
Patch436: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.436
Patch437: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.437
Patch438: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.438
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@ -1078,6 +1079,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch435 -p0
%patch436 -p0
%patch437 -p0
%patch438 -p0
# install spell files
@ -1542,6 +1544,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Wed May 26 2010 Karsten Hopp <karsten@redhat.com> 7.2.438-1
- patchlevel 438
* Sat May 22 2010 Karsten Hopp <karsten@redhat.com> 7.2.437-1
- patchlevel 437