thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

Fix a few compiler warnings. Fix crash with encrypted undo file.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-06-06 14:20:26 +02:00
parent 860cae1cec
commit 56be950094
10 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blowfish.c
View File

@@ -413,6 +413,11 @@ bf_key_init(password)
key = sha256_key(password);
keylen = (int)STRLEN(key);
if (keylen == 0)
{
EMSG(_("E831: bf_key_init() called with empty password"));
return;
}
for (i = 0; i < 256; ++i)
{
sbx[0][i] = sbi[0][i];

2
src/feature.h
View File

@@ -127,7 +127,7 @@
#endif
/*
* Message history is fixed at 100 message, 20 for the tiny version.
* Message history is fixed at 200 message, 20 for the tiny version.
*/
#ifdef FEAT_SMALL
# define MAX_MSG_HIST_LEN 200

4
src/gui_beval.c
View File

@@ -20,6 +20,7 @@ general_beval_cb(beval, state)
BalloonEval *beval;
int state UNUSED;
{
#ifdef FEAT_EVAL
win_T *wp;
int col;
int use_sandbox;
@@ -29,8 +30,9 @@ general_beval_cb(beval, state)
long winnr = 0;
char_u *bexpr;
buf_T *save_curbuf;
#ifdef FEAT_WINDOWS
# ifdef FEAT_WINDOWS
win_T *cw;
# endif
#endif
static int recursive = FALSE;

4
src/menu.c
View File

@@ -56,10 +56,10 @@ static char_u *menu_skip_part __ARGS((char_u *p));
#endif
#ifdef FEAT_MULTI_LANG
static char_u *menutrans_lookup __ARGS((char_u *name, int len));
static void menu_unescape_name __ARGS((char_u *p));
#endif
static char_u *menu_translate_tab_and_shift __ARGS((char_u *arg_start));
static void menu_unescape_name __ARGS((char_u *p));
/* The character for each menu mode */
static char_u menu_mode_chars[] = {'n', 'v', 's', 'o', 'i', 'c', 't'};
@@ -2525,7 +2525,6 @@ menutrans_lookup(name, len)
return NULL;
}
#endif /* FEAT_MULTI_LANG */
/*
* Unescape the name in the translate dictionary table.
@@ -2540,6 +2539,7 @@ menu_unescape_name(name)
if (*p == '\\')
STRMOVE(p, p + 1);
}
#endif /* FEAT_MULTI_LANG */
/*
* Isolate the menu name.

4
src/syntax.c
View File

@@ -235,7 +235,7 @@ static char_u **syn_cmdlinep;
/*
* Another Annoying Hack(TM): To prevent rules from other ":syn include"'d
* files from from leaking into ALLBUT lists, we assign a unique ID to the
* files from leaking into ALLBUT lists, we assign a unique ID to the
* rules in each ":syn include"'d file.
*/
static int current_syn_inc_tag = 0;
@@ -4500,11 +4500,13 @@ get_syn_options(arg, opt, conceal_char)
}
else
#endif
{
#ifdef FEAT_CONCEAL
*conceal_char = arg[6];
#else
;
#endif
}
arg = skipwhite(arg + 7);
}
else

8
src/undo.c
View File

@@ -1503,13 +1503,19 @@ u_read_undo(name, hash, orig_name)
if (version == UF_VERSION_CRYPT)
{
#ifdef FEAT_CRYPT
if (*curbuf->b_p_key == NUL)
{
EMSG2(_("E832: Non-encrypted file has encrypted undo file: %s"),
file_name);
goto error;
}
if (prepare_crypt_read(fp) == FAIL)
{
EMSG2(_("E826: Undo file decryption failed: %s"), file_name);
goto error;
}
#else
EMSG2(_("E826: Undo file is encrypted: %s"), file_name);
EMSG2(_("E827: Undo file is encrypted: %s"), file_name);
goto error;
#endif
}