aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.009

Browse Source 
Problem:    Win32: Crash on Windows when using a bad argument for strftime().
            (Christian Brabandt)
Solution:   Use the bad_param_handler(). (Mike Williams)
This commit is contained in:
Bram Moolenaar 2010-09-21 17:29:23 +02:00
parent 3368ea2152
commit d32a99a6d9
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/os_win32.c
View File

@ -1615,6 +1615,35 @@ executable_exists(char *name)
return TRUE;
}
#if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \
__MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400)
/*
* Bad parameter handler.
*
* Certain MS CRT functions will intentionally crash when passed invalid
* parameters to highlight possible security holes. Setting this function as
* the bad parameter handler will prevent the crash.
*
* In debug builds the parameters contain CRT information that might help track
* down the source of a problem, but in non-debug builds the arguments are all
* NULL/0. Debug builds will also produce assert dialogs from the CRT, it is
* worth allowing these to make debugging of issues easier.
*/
static void
bad_param_handler(const wchar_t *expression,
const wchar_t *function,
const wchar_t *file,
unsigned int line,
uintptr_t pReserved)
{
}
# define SET_INVALID_PARAM_HANDLER \
((void)_set_invalid_parameter_handler(bad_param_handler))
#else
# define SET_INVALID_PARAM_HANDLER
#endif
#ifdef FEAT_GUI_W32
/*
@ -1627,6 +1656,9 @@ mch_init(void)
extern int _fmode;
#endif
/* Silently handle invalid parameters to CRT functions */
SET_INVALID_PARAM_HANDLER;
/* Let critical errors result in a failure, not in a dialog box. Required
* for the timestamp test to work on removed floppies. */
SetErrorMode(SEM_FAILCRITICALERRORS);
@ -2103,6 +2135,9 @@ mch_init(void)
extern int _fmode;
#endif
/* Silently handle invalid parameters to CRT functions */
SET_INVALID_PARAM_HANDLER;
/* Let critical errors result in a failure, not in a dialog box. Required
* for the timestamp test to work on removed floppies. */
SetErrorMode(SEM_FAILCRITICALERRORS);

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
9,
/**/
8,
/**/