Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for getCmdLineAndEnvVars which fails on x64 versions of Windows #20

Merged
merged 1 commit into from
Jul 26, 2016
Merged

Fix for getCmdLineAndEnvVars which fails on x64 versions of Windows #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion native/envvar-cmdline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ JNIEXPORT jstring JNICALL Java_org_jvnet_winp_Native_getCmdLineAndEnvVars(
}

int cmdLineLen = lstrlen(pszCmdLine);
size_t envSize = info.RegionSize;
size_t envSize = info.RegionSize - ((char*)pEnvStr - (char*)info.BaseAddress);

auto_localmem<LPWSTR> buf((cmdLineLen + 1/*for \0*/) * 2 + envSize);
if(!buf) {
reportError(pEnv, "Buffer allocation failed");
Expand Down