RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:48:11 +00:00
Code Issues Activity Actions

LibWeb: Do not use OS error codes in the error callback for file:// URLs

Browse source 
The error code passed here is expected to be an HTTP error code. Passing
errno codes does not make sense in that context.
This commit is contained in:
Timothy Flynn 2023-04-04 16:12:42 -04:00 • committed by Linus Groh
parent ddb4137ed4
commit 69e8216f2c
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -244,8 +244,10 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
if (file_or_error.is_error()) {
log_failure(request, file_or_error.error());
if (error_callback)
error_callback(DeprecatedString::formatted("{}", file_or_error.error()), file_or_error.error().code());
if (error_callback) {
auto status = file_or_error.error().code() == ENOENT ? 404u : 500u;
error_callback(DeprecatedString::formatted("{}", file_or_error.error()), status);
}
return;
}
@ -255,7 +257,7 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
if (maybe_file.is_error()) {
log_failure(request, maybe_file.error());
if (error_callback)
error_callback(DeprecatedString::formatted("{}", maybe_file.error()), maybe_file.error().code());
error_callback(DeprecatedString::formatted("{}", maybe_file.error()), 500u);
return;
}
@ -264,7 +266,7 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
if (maybe_data.is_error()) {
log_failure(request, maybe_data.error());
if (error_callback)
error_callback(DeprecatedString::formatted("{}", maybe_data.error()), maybe_data.error().code());
error_callback(DeprecatedString::formatted("{}", maybe_data.error()), 500u);
return;
}
auto data = maybe_data.release_value();