From 031748d9c88c60d6a7c79b00599955c49a3c56aa Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Wed, 12 Apr 2017 21:19:42 +0200 Subject: [PATCH] Avoid an assertion when compiling in debug mode with MSVC 2015 Seemingly, when removing an argument from argv, and thus inserting a null pointer to shorten the array, causes an assertion because the null pointer is not a valid heap pointer (sic!) Fixes bug #10440 --- src/main.cpp | 2 +- src/support/os.h | 2 +- src/support/os_cygwin.cpp | 4 ++-- src/support/os_unix.cpp | 4 ++-- src/support/os_win32.cpp | 18 +++++++++++++++++- src/tex2lyx/tex2lyx.cpp | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b72725372b..5c4fb46845 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char * argv[]) // early as possible. lyx::lyxerr.setStream(cerr); - lyx::support::os::init(argc, argv); + lyx::support::os::init(argc, &argv); lyx::LyX the_lyx_instance; diff --git a/src/support/os.h b/src/support/os.h index 73eb86d7f3..9b38e4e44e 100644 --- a/src/support/os.h +++ b/src/support/os.h @@ -38,7 +38,7 @@ enum file_access { }; /// Do some work just once. -void init(int argc, char * argv[]); +void init(int argc, char ** argv[]); /// Returns the i-th program argument in utf8 encoding. std::string utf8_argv(int i); diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp index 702d67f418..1de0da6ef1 100644 --- a/src/support/os_cygwin.cpp +++ b/src/support/os_cygwin.cpp @@ -210,10 +210,10 @@ BOOL terminate_handler(DWORD event) } // namespace anon -void init(int argc, char * argv[]) +void init(int argc, char ** argv[]) { argc_ = argc; - argv_ = argv; + argv_ = *argv; // Set environment's default locale setlocale(LC_ALL, ""); diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp index 230dab5aa9..135d314991 100644 --- a/src/support/os_unix.cpp +++ b/src/support/os_unix.cpp @@ -45,10 +45,10 @@ char ** argv_ = 0; } // namespace anon -void init(int argc, char * argv[]) +void init(int argc, char ** argv[]) { argc_ = argc; - argv_ = argv; + argv_ = *argv; // Set environment's default locale setlocale(LC_ALL, ""); diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp index a5b5bbe825..9078f594d7 100644 --- a/src/support/os_win32.cpp +++ b/src/support/os_win32.cpp @@ -99,7 +99,7 @@ BOOL terminate_handler(DWORD event) } // namespace anon -void init(int argc, char * argv[]) +void init(int argc, char ** argv[]) { /* Note from Angus, 17 Jan 2005: * @@ -158,6 +158,22 @@ void init(int argc, char * argv[]) */ +#if defined(_MSC_VER) && (_MSC_VER >= 1900) + // Removing an argument from argv leads to an assertion on Windows + // when compiling with MSVC 2015 in debug mode (see bug #10440). + // To avoid this we make a copy of the array of pointers. + char ** newargv = (char **) malloc((argc + 1) * sizeof(char *)); + if (newargv) { + memcpy(newargv, *argv, (argc + 1) * sizeof(char *)); + *argv = newargv; + } else { + lyxerr << "LyX warning: Cannot make a copy of " + "command line arguments!" + << endl; + } +#endif + + // Get the wide program arguments array #if defined(_MSC_VER) && (_MSC_VER >= 1900) argv_ = CommandLineToArgvW(GetCommandLineW(), &argc_); diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp index 3f6fe73821..65a2b91ea2 100644 --- a/src/tex2lyx/tex2lyx.cpp +++ b/src/tex2lyx/tex2lyx.cpp @@ -1179,7 +1179,7 @@ int main(int argc, char * argv[]) lyx::lyxerr.setStream(cerr); - os::init(argc, argv); + os::init(argc, &argv); lyx::TeX2LyXApp app(argc, argv); return app.exec(); -- 2.39.2