ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

retarget: Fix path behaviour without leading slash 

Current behaviour ends up undefined when the constructor leaves early.
Now FilePath just discards leading slashes and otherwise asserts if the
path is bad.
pull/6156/head
Christopher Haster 2018-02-21 14:43:53 -06:00
parent 5c7cd1f689
commit 72b0a07ffe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/FilePath.cpp
View File

@ -18,9 +18,10 @@
namespace mbed {
FilePath::FilePath(const char* file_path) : file_name(NULL), fb(NULL) {
if ((file_path[0] != '/') || (file_path[1] == 0)) return;
// skip slashes
file_path += strspn(file_path, "/");
const char* file_system = &file_path[1];
const char* file_system = file_path;
file_name = file_system;
int len = 0;
while (true) {
@ -36,6 +37,7 @@ FilePath::FilePath(const char* file_path) : file_name(NULL), fb(NULL) {
file_name++;
}
MBED_ASSERT(len != 0);
fb = FileBase::lookup(file_system, len);
}