zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: off-by-one in Windows env and cwd sizing (#1238)

Browse Source
This commit is contained in:
Mark Olesen
2019-05-20 17:41:27 +01:00
committed by Andrew Heather
parent 8345452484
commit 4e58e355b8
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OSspecific/MSwindows/MSwindows.C
View File

@ -350,12 +350,16 @@ Foam::string Foam::getEnv(const std::string& envName)
{ {
std::string env; std::string env;
const auto len = ::GetEnvironmentVariable(envName.c_str(), nullptr, 0); auto len = ::GetEnvironmentVariable(envName.c_str(), nullptr, 0);
// len [return] = size with trailing nul char, or zero on failure
if (len) if (len)
{ {
env.resize(len+1); env.resize(len);
::GetEnvironmentVariable(envName.c_str(), &(env[0]), len+1);
// len [in] = size with trailing nul char
// len [return] = size without trailing nul char
len = ::GetEnvironmentVariable(envName.c_str(), &(env[0]), len);
env.resize(len); env.resize(len);
return fileName::validate(env); return fileName::validate(env);
@ -442,16 +446,18 @@ Foam::fileName Foam::home(const std::string& userName)
Foam::fileName Foam::cwd() Foam::fileName Foam::cwd()
{ {
string path; string path;
const DWORD len = ::GetCurrentDirectory(0, nullptr); auto len = ::GetCurrentDirectory(0, nullptr);
// len [return] = size with trailing nul char, or zero on failure
if (len) if (len)
{ {
path.resize(len+1);
::GetCurrentDirectory(len+1, &(path[0]));
path.resize(len); path.resize(len);
// len [in] = size with trailing nul char
// len [return] = size without trailing nul char
len = ::GetCurrentDirectory(len, &(path[0]));
path.resize(len);
return fileName::validate(path); return fileName::validate(path);
} }