RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 18:57:35 +00:00
Code Issues Activity Actions

LibGUI/FileIconProvider: Return s_file_icon when stat() fails

Browse source 
Previously when using icon_for_path(), without specifying t_mode, on an
anonymous file it would return an empty Icon causing problems down the
line. Instead return the s_file_icon when stat fails.
This commit is contained in:
Marcus Nilsson 2021-06-03 13:47:59 +02:00 • committed by Linus Groh
parent bc174b0fd0
commit 5a8cc85328
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibGUI/FileIconProvider.cpp
View file

@ -122,7 +122,7 @@ Icon FileIconProvider::icon_for_path(const String& path)
{ {
struct stat stat; struct stat stat;
if (::stat(path.characters(), &stat) < 0) if (::stat(path.characters(), &stat) < 0)
return {}; return s_file_icon;
return icon_for_path(path, stat.st_mode); return icon_for_path(path, stat.st_mode);
} }
@ -225,8 +225,6 @@ Icon FileIconProvider::icon_for_path(const String& path, mode_t mode)
target_path = Core::File::real_path_for(String::formatted("{}/{}", LexicalPath(path).dirname(), raw_symlink_target)); target_path = Core::File::real_path_for(String::formatted("{}/{}", LexicalPath(path).dirname(), raw_symlink_target));
} }
auto target_icon = icon_for_path(target_path); auto target_icon = icon_for_path(target_path);
if (target_icon.sizes().is_empty())
return s_symlink_icon;
Icon generated_icon; Icon generated_icon;
for (auto size : target_icon.sizes()) { for (auto size : target_icon.sizes()) {