|
 |
bdba8ba |
To: vim-dev@vim.org
|
|
|
bdba8ba |
Subject: Patch 7.0.153
|
|
|
bdba8ba |
Fcc: outbox
|
|
|
bdba8ba |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
bdba8ba |
Mime-Version: 1.0
|
|
|
bdba8ba |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
bdba8ba |
Content-Transfer-Encoding: 8bit
|
|
|
bdba8ba |
------------
|
|
|
bdba8ba |
|
|
|
bdba8ba |
Patch 7.0.153
|
|
|
bdba8ba |
Problem: When using cscope and opening the temp file fails Vim crashes.
|
|
|
bdba8ba |
(Kaya Bekiroglu)
|
|
|
bdba8ba |
Solution: Check for NULL pointer returned from mch_open().
|
|
|
bdba8ba |
Files: src/if_cscope.c
|
|
|
bdba8ba |
|
|
|
bdba8ba |
|
|
|
bdba8ba |
*** ../vim-7.0.152/src/if_cscope.c Tue Aug 29 17:28:56 2006
|
|
|
bdba8ba |
--- src/if_cscope.c Mon Oct 30 22:26:01 2006
|
|
|
bdba8ba |
***************
|
|
|
bdba8ba |
*** 1100,1137 ****
|
|
|
bdba8ba |
if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
|
|
|
bdba8ba |
{
|
|
|
bdba8ba |
/* fill error list */
|
|
|
bdba8ba |
! FILE *f;
|
|
|
bdba8ba |
! char_u *tmp = vim_tempname('c');
|
|
|
bdba8ba |
qf_info_T *qi = NULL;
|
|
|
bdba8ba |
win_T *wp = NULL;
|
|
|
bdba8ba |
|
|
|
bdba8ba |
f = mch_fopen((char *)tmp, "w");
|
|
|
bdba8ba |
! cs_file_results(f, nummatches);
|
|
|
bdba8ba |
! fclose(f);
|
|
|
bdba8ba |
! if (use_ll) /* Use location list */
|
|
|
bdba8ba |
! wp = curwin;
|
|
|
bdba8ba |
! /* '-' starts a new error list */
|
|
|
bdba8ba |
! if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m", *qfpos == '-') > 0)
|
|
|
bdba8ba |
{
|
|
|
bdba8ba |
! # ifdef FEAT_WINDOWS
|
|
|
bdba8ba |
! if (postponed_split != 0)
|
|
|
bdba8ba |
{
|
|
|
bdba8ba |
! win_split(postponed_split > 0 ? postponed_split : 0,
|
|
|
bdba8ba |
postponed_split_flags);
|
|
|
bdba8ba |
# ifdef FEAT_SCROLLBIND
|
|
|
bdba8ba |
! curwin->w_p_scb = FALSE;
|
|
|
bdba8ba |
# endif
|
|
|
bdba8ba |
! postponed_split = 0;
|
|
|
bdba8ba |
! }
|
|
|
bdba8ba |
# endif
|
|
|
bdba8ba |
! if (use_ll)
|
|
|
bdba8ba |
! /*
|
|
|
bdba8ba |
! * In the location list window, use the displayed location
|
|
|
bdba8ba |
! * list. Otherwise, use the location list for the window.
|
|
|
bdba8ba |
! */
|
|
|
bdba8ba |
! qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL) ?
|
|
|
bdba8ba |
! wp->w_llist_ref : wp->w_llist;
|
|
|
bdba8ba |
! qf_jump(qi, 0, 0, forceit);
|
|
|
bdba8ba |
}
|
|
|
bdba8ba |
mch_remove(tmp);
|
|
|
bdba8ba |
vim_free(tmp);
|
|
|
bdba8ba |
--- 1100,1143 ----
|
|
|
bdba8ba |
if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
|
|
|
bdba8ba |
{
|
|
|
bdba8ba |
/* fill error list */
|
|
|
bdba8ba |
! FILE *f;
|
|
|
bdba8ba |
! char_u *tmp = vim_tempname('c');
|
|
|
bdba8ba |
qf_info_T *qi = NULL;
|
|
|
bdba8ba |
win_T *wp = NULL;
|
|
|
bdba8ba |
|
|
|
bdba8ba |
f = mch_fopen((char *)tmp, "w");
|
|
|
bdba8ba |
! if (f == NULL)
|
|
|
bdba8ba |
! EMSG2(_(e_notopen), tmp);
|
|
|
bdba8ba |
! else
|
|
|
bdba8ba |
{
|
|
|
bdba8ba |
! cs_file_results(f, nummatches);
|
|
|
bdba8ba |
! fclose(f);
|
|
|
bdba8ba |
! if (use_ll) /* Use location list */
|
|
|
bdba8ba |
! wp = curwin;
|
|
|
bdba8ba |
! /* '-' starts a new error list */
|
|
|
bdba8ba |
! if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m",
|
|
|
bdba8ba |
! *qfpos == '-') > 0)
|
|
|
bdba8ba |
{
|
|
|
bdba8ba |
! # ifdef FEAT_WINDOWS
|
|
|
bdba8ba |
! if (postponed_split != 0)
|
|
|
bdba8ba |
! {
|
|
|
bdba8ba |
! win_split(postponed_split > 0 ? postponed_split : 0,
|
|
|
bdba8ba |
postponed_split_flags);
|
|
|
bdba8ba |
# ifdef FEAT_SCROLLBIND
|
|
|
bdba8ba |
! curwin->w_p_scb = FALSE;
|
|
|
bdba8ba |
# endif
|
|
|
bdba8ba |
! postponed_split = 0;
|
|
|
bdba8ba |
! }
|
|
|
bdba8ba |
# endif
|
|
|
bdba8ba |
! if (use_ll)
|
|
|
bdba8ba |
! /*
|
|
|
bdba8ba |
! * In the location list window, use the displayed location
|
|
|
bdba8ba |
! * list. Otherwise, use the location list for the window.
|
|
|
bdba8ba |
! */
|
|
|
bdba8ba |
! qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL)
|
|
|
bdba8ba |
! ? wp->w_llist_ref : wp->w_llist;
|
|
|
bdba8ba |
! qf_jump(qi, 0, 0, forceit);
|
|
|
bdba8ba |
! }
|
|
|
bdba8ba |
}
|
|
|
bdba8ba |
mch_remove(tmp);
|
|
|
bdba8ba |
vim_free(tmp);
|
|
|
bdba8ba |
***************
|
|
|
bdba8ba |
*** 1723,1729 ****
|
|
|
bdba8ba |
continue;
|
|
|
bdba8ba |
|
|
|
bdba8ba |
context = (char *)alloc((unsigned)strlen(cntx)+5);
|
|
|
bdba8ba |
! if (context==NULL)
|
|
|
bdba8ba |
continue;
|
|
|
bdba8ba |
|
|
|
bdba8ba |
if (strcmp(cntx, "<global>")==0)
|
|
|
bdba8ba |
--- 1729,1735 ----
|
|
|
bdba8ba |
continue;
|
|
|
bdba8ba |
|
|
|
bdba8ba |
context = (char *)alloc((unsigned)strlen(cntx)+5);
|
|
|
bdba8ba |
! if (context == NULL)
|
|
|
bdba8ba |
continue;
|
|
|
bdba8ba |
|
|
|
bdba8ba |
if (strcmp(cntx, "<global>")==0)
|
|
|
bdba8ba |
***************
|
|
|
bdba8ba |
*** 1731,1737 ****
|
|
|
bdba8ba |
else
|
|
|
bdba8ba |
sprintf(context, "<<%s>>", cntx);
|
|
|
bdba8ba |
|
|
|
bdba8ba |
! if (search==NULL)
|
|
|
bdba8ba |
fprintf(f, "%s\t%s\t%s\n", fullname, slno, context);
|
|
|
bdba8ba |
else
|
|
|
bdba8ba |
fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search);
|
|
|
bdba8ba |
--- 1737,1743 ----
|
|
|
bdba8ba |
else
|
|
|
bdba8ba |
sprintf(context, "<<%s>>", cntx);
|
|
|
bdba8ba |
|
|
|
bdba8ba |
! if (search == NULL)
|
|
|
bdba8ba |
fprintf(f, "%s\t%s\t%s\n", fullname, slno, context);
|
|
|
bdba8ba |
else
|
|
|
bdba8ba |
fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search);
|
|
|
bdba8ba |
*** ../vim-7.0.152/src/version.c Tue Oct 24 22:31:51 2006
|
|
|
bdba8ba |
--- src/version.c Mon Oct 30 22:29:45 2006
|
|
|
bdba8ba |
***************
|
|
|
bdba8ba |
*** 668,669 ****
|
|
|
bdba8ba |
--- 668,671 ----
|
|
|
bdba8ba |
{ /* Add new patch number below this line */
|
|
|
bdba8ba |
+ /**/
|
|
|
bdba8ba |
+ 153,
|
|
|
bdba8ba |
/**/
|
|
|
bdba8ba |
|
|
|
bdba8ba |
--
|
|
|
bdba8ba |
You cannot have a baby in one month by getting nine women pregnant.
|
|
|
bdba8ba |
|
|
|
bdba8ba |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
bdba8ba |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
bdba8ba |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
bdba8ba |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|