RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

LibIMAP: Parse body-ext-1part for every one part body type

Browse source 
Previously we were only doing it only for body-type-text, which isn't
correct to spec.

Fixes a crash when parsing a BODYSTRUCTURE response on a mail with
attachments.
This commit is contained in:
Karol Kosek 2023-09-02 20:39:37 +02:00 • committed by Andrew Kaster
parent a61a66c685
commit e9cf35fd60
1 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Userland/Libraries/LibIMAP/Parser.cpp
View file

@ -452,41 +452,6 @@ BodyStructure Parser::parse_one_part_body()
// NOTE: "media-text SP body-fields" part is already parsed. // NOTE: "media-text SP body-fields" part is already parsed.
consume(" "sv); consume(" "sv);
data.lines = MUST(parse_number()); data.lines = MUST(parse_number());
if (!try_consume(")"sv)) {
consume(" "sv);
auto md5 = parse_nstring();
if (md5.has_value())
data.md5 = { md5.value() };
if (!try_consume(")"sv)) {
consume(" "sv);
if (!try_consume("NIL"sv)) {
auto disposition = parse_disposition();
data.disposition = { disposition };
}
if (!try_consume(")"sv)) {
consume(" "sv);
if (!try_consume("NIL"sv)) {
data.langs = { parse_langs() };
}
if (!try_consume(")"sv)) {
consume(" "sv);
auto location = parse_nstring();
if (location.has_value())
data.location = { location.value() };
Vector<BodyExtension> extensions;
while (!try_consume(")"sv)) {
extensions.append(parse_body_extension());
try_consume(" "sv);
}
data.extensions = { move(extensions) };
}
}
}
}
} else if (data.type.equals_ignoring_ascii_case("MESSAGE"sv) && data.subtype.equals_ignoring_ascii_case("RFC822"sv)) { } else if (data.type.equals_ignoring_ascii_case("MESSAGE"sv) && data.subtype.equals_ignoring_ascii_case("RFC822"sv)) {
// body-type-msg // body-type-msg
// NOTE: "media-message SP body-fields" part is already parsed. // NOTE: "media-message SP body-fields" part is already parsed.
@ -497,6 +462,42 @@ BodyStructure Parser::parse_one_part_body()
// NOTE: "media-basic SP body-fields" is already parsed. // NOTE: "media-basic SP body-fields" is already parsed.
} }
if (!try_consume(")"sv)) {
consume(" "sv);
// body-ext-1part
[&]() {
data.md5 = Optional<DeprecatedString>(parse_nstring());
if (try_consume(")"sv))
return;
consume(" "sv);
if (!try_consume("NIL"sv)) {
auto disposition = parse_disposition();
data.disposition = { disposition };
}
if (try_consume(")"sv))
return;
consume(" "sv);
if (!try_consume("NIL"sv)) {
data.langs = { parse_langs() };
}
if (try_consume(")"sv))
return;
consume(" "sv);
data.location = Optional<DeprecatedString>(parse_nstring());
Vector<BodyExtension> extensions;
while (!try_consume(")"sv)) {
extensions.append(parse_body_extension());
try_consume(" "sv);
}
data.extensions = { move(extensions) };
}();
}
return BodyStructure(move(data)); return BodyStructure(move(data));
} }
Vector<DeprecatedString> Parser::parse_langs() Vector<DeprecatedString> Parser::parse_langs()