ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox5: fix substring calculation for VM files in root directory 

Fixes #2561
This commit is contained in:
Christian Prochaska 2017-11-03 18:26:08 +01:00 committed by Christian Helmuth
parent 65b2e63bb9
commit e6b7e1f6e1
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/ports/ports/virtualbox5.hash
View File

@ -1 +1 @@
c916354430e16892bbc739aaecd86b9451860326
25d9be4a067a1c748bab7a60220d7477e552957a

1
repos/ports/src/virtualbox5/patches/series
View File

@ -9,3 +9,4 @@ dev_e1000.patch
tm_tpr_vbox5.patch
vm.patch
mm.patch
substr.patch

39
repos/ports/src/virtualbox5/patches/substr.patch Normal file
View File

@ -0,0 +1,39 @@
substr.patch
diff --git a/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp
index ef9811a..79ab5d6 100644
--- a/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp
+++ b/src/app/virtualbox/src/VBox/Main/src-server/MachineImpl.cpp
@@ -7347,7 +7347,11 @@ void Machine::i_copyPathRelativeToMachine(const Utf8Str &strSource,
if (RTPathStartsWith(strSource.c_str(), strTarget.c_str()))
{
// is relative: then append what's left
- strTarget = strSource.substr(strTarget.length() + 1); // skip '/'
+ if (RTPathIsSame(strTarget.c_str(), "/"))
+ strTarget = strSource.substr(strTarget.length()); // skip '/'
+ else
+ strTarget = strSource.substr(strTarget.length() + 1); // skip '/'
+
// for empty paths (only possible for subdirs) use "." to avoid
// triggering default settings for not present config attributes.
if (strTarget.isEmpty())
diff --git a/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp b/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp
index 9e83858..51d578f 100644
--- a/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp
+++ b/src/app/virtualbox/src/VBox/Main/src-server/MediumImpl.cpp
@@ -4507,9 +4507,12 @@ void Medium::i_saveSettingsOne(settings::Medium &data, const Utf8Str &strHardDis
// make path relative if needed
if ( !strHardDiskFolder.isEmpty()
&& RTPathStartsWith(m->strLocationFull.c_str(), strHardDiskFolder.c_str())
- )
- data.strLocation = m->strLocationFull.substr(strHardDiskFolder.length() + 1);
- else
+ ) {
+ if (RTPathIsSame(strHardDiskFolder.c_str(), "/"))
+ data.strLocation = m->strLocationFull.substr(strHardDiskFolder.length());
+ else
+ data.strLocation = m->strLocationFull.substr(strHardDiskFolder.length() + 1);
+ } else
data.strLocation = m->strLocationFull;
data.strFormat = m->strFormat;