RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:07:34 +00:00
Code Issues Activity Actions

LibWeb: Ignore invalid encodings in Content-Type headers

Browse source
This commit is contained in:
Simon Wanner 2022-03-20 21:22:54 +01:00 • committed by Andreas Kling
parent 681fac07ed
commit 1d55437a76
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include <AK/Function.h> #include <AK/Function.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
#include <LibTextCodec/Decoder.h>
#include <LibWeb/HTML/HTMLImageElement.h> #include <LibWeb/HTML/HTMLImageElement.h>
#include <LibWeb/Loader/Resource.h> #include <LibWeb/Loader/Resource.h>
@ -64,6 +65,11 @@ static String mime_type_from_content_type(const String& content_type)
return content_type; return content_type;
} }
static bool is_valid_encoding(String const& encoding)
{
return TextCodec::decoder_for(encoding);
}
void Resource::did_load(Badge<ResourceLoader>, ReadonlyBytes data, const HashMap<String, String, CaseInsensitiveStringTraits>& headers, Optional<u32> status_code) void Resource::did_load(Badge<ResourceLoader>, ReadonlyBytes data, const HashMap<String, String, CaseInsensitiveStringTraits>& headers, Optional<u32> status_code)
{ {
VERIFY(!m_loaded); VERIFY(!m_loaded);
@ -98,8 +104,8 @@ void Resource::did_load(Badge<ResourceLoader>, ReadonlyBytes data, const HashMap
m_encoding = {}; m_encoding = {};
if (content_type.has_value()) { if (content_type.has_value()) {
auto encoding = encoding_from_content_type(content_type.value()); auto encoding = encoding_from_content_type(content_type.value());
if (encoding.has_value()) { if (encoding.has_value() && is_valid_encoding(encoding.value())) {
dbgln_if(RESOURCE_DEBUG, "Set encoding '{}' from Content-Type", encoding.has_value()); dbgln_if(RESOURCE_DEBUG, "Set encoding '{}' from Content-Type", encoding.value());
m_encoding = encoding.value(); m_encoding = encoding.value();
} }
} }