Fix base::get_absolute_path() fixing base::normalize_path() function #120
Conversation
base/fs.cpp
Outdated
| if (part == ".") { | ||
| last_dot = true; | ||
| std::vector<std::string> fn_parts; | ||
| bool has_root = (!_path.empty() && _path[0] == path_separator); |
There was a problem hiding this comment.
warning: variable 'has_root' of type 'bool' can be declared 'const' [misc-const-correctness]
| bool has_root = (!_path.empty() && _path[0] == path_separator); | |
| bool const has_root = (!_path.empty() && _path[0] == path_separator); |
Gasparoken
force-pushed
the
fix-get-abs-path
branch
from
5cde484 to
bd69dea
Compare
base/fs.cpp
Outdated
| if (!path.empty() && path[0] == path_separator) { | ||
| fn.push_back(path_separator); | ||
| std::vector<std::string> fn_parts; | ||
| bool has_root = (!path.empty() && path[0] == path_separator); |
There was a problem hiding this comment.
warning: variable 'has_root' of type 'bool' can be declared 'const' [misc-const-correctness]
| bool has_root = (!path.empty() && path[0] == path_separator); | |
| bool const has_root = (!path.empty() && path[0] == path_separator); |
base/fs.cpp
Outdated
| fn.push_back(path_separator); | ||
| std::vector<std::string> fn_parts; | ||
| bool has_root = (!path.empty() && path[0] == path_separator); | ||
| bool last_dot = (parts.back() == "."); |
There was a problem hiding this comment.
warning: variable 'last_dot' of type 'bool' can be declared 'const' [misc-const-correctness]
| bool last_dot = (parts.back() == "."); | |
| bool const last_dot = (parts.back() == "."); |
base/fs.cpp
Outdated
| std::vector<std::string> fn_parts; | ||
| bool has_root = (!path.empty() && path[0] == path_separator); | ||
| bool last_dot = (parts.back() == "."); | ||
| bool last_slash = parts.back().empty(); |
There was a problem hiding this comment.
warning: variable 'last_slash' of type 'bool' can be declared 'const' [misc-const-correctness]
| bool last_slash = parts.back().empty(); | |
| bool const last_slash = parts.back().empty(); |
Gasparoken
force-pushed
the
fix-get-abs-path
branch
from
bd69dea to
0bb35e7
Compare
base/fs.cpp
Outdated
| // Skip each dot part. | ||
| if (part.empty() || part == ".") | ||
| continue; | ||
| else if (part == "..") { |
There was a problem hiding this comment.
The "else" word can be removed here because you are calling "continue;" inside the previous if.
| else if (part == "..") { | |
| if (part == "..") { |
| @@ -281,13 +281,36 @@ std::string normalize_path(const std::string& _path) | |||
| // Replace multiple slashes with a single path_separator. | |||
| std::string path = fix_path_separators(_path); | |||
|
|
|||
| std::string fn; | |||
| fn.reserve(path.size()); | |||
There was a problem hiding this comment.
Don't remove the call to reserve, it is used to reserve memory beforehand and avoid having to resize the buffer when the string gets bigger.
Gasparoken
force-pushed
the
fix-get-abs-path
branch
from
0bb35e7 to
a3fa716
Compare
|
clang-tidy review says "All clean, LGTM! 👍" |
|
It looks like the precommit failed https://github.com/aseprite/laf/actions/runs/12483083166/job/34838239516#step:4:120 |
base::get_absolute_path() resulted in bugs when more than two or more double dots were present in the input path. The source of the error was the base::normalize_path() function which has been fixed. Also added tests in 'fs_tests.cpp'. This fix is part of the solution of aseprite/aseprite#4851.
Gasparoken
force-pushed
the
fix-get-abs-path
branch
from
a3fa716 to
266f050
Compare
|
clang-tidy review says "All clean, LGTM! 👍" |
Part of aseprite/aseprite#4851