firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 06:03:02 +01:00
Code Issues

Merge pull request #35 from aafemt/CORE-5237

Browse Source 
Postfix for #24 that fixes CORE-5271
This commit is contained in:
Dmitry Yemanov 2016-06-11 20:53:06 +03:00 committed by GitHub
commit 739b993894
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/os/posix/path_utils.cpp
View File

@ -136,6 +136,12 @@ void PathUtils::concatPath(Firebird::PathName& result,
const Firebird::PathName& first, const Firebird::PathName& first,
const Firebird::PathName& second) const Firebird::PathName& second)
{ {
if (first.length() == 0)
{
result = second;
return;
}
result = first; result = first;
// First path used to be from trusted sources like getRootDirectory, etc. // First path used to be from trusted sources like getRootDirectory, etc.

6
src/common/os/win32/path_utils.cpp
View File

@ -108,6 +108,12 @@ void PathUtils::concatPath(Firebird::PathName& result,
const Firebird::PathName& first, const Firebird::PathName& first,
const Firebird::PathName& second) const Firebird::PathName& second)
{ {
if (first.length() == 0)
{
result = second;
return;
}
result = first; result = first;
// First path used to be from trusted sources like getRootDirectory, etc. // First path used to be from trusted sources like getRootDirectory, etc.