summaryrefslogtreecommitdiff
path: root/desktop/win32
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-18 13:19:45 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-01-18 16:55:04 +0100
commit2fcba16dc48ed7c0a507c18731a41a99f485ee46 (patch)
tree09094217f27db91e14328ccf312b0ce714894eeb /desktop/win32
parent36e8d5d137260decabb7d2436fff2d3a93278f9d (diff)
Never pass -env: arguments across OfficeIPC connection
Change-Id: I1874ad0542bc8dcbe9ec588599a054030fd5d7d8
Diffstat (limited to 'desktop/win32')
-rw-r--r--desktop/win32/source/officeloader/officeloader.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index c7c91c64f707..527125f14a8a 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -21,6 +21,7 @@
#define _UNICODE
#include <cstddef>
+#include <cwchar>
#define WIN32_LEAN_AND_MEAN
#if defined _MSC_VER
@@ -290,7 +291,12 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
}
for ( int argn = 1; fSuccess && argn < argc2; argn++ )
{
- fSuccess = writeArgument(hPipe, ',', argv2[argn]);
+ if (std::wcsncmp(
+ argv2[argn], L"-env:", std::wcslen(L"-env:"))
+ != 0)
+ {
+ fSuccess = writeArgument(hPipe, ',', argv2[argn]);
+ }
}
if ( fSuccess )