Skip to content

Fix segfault when preparing BODYSTRUCTURE response #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix segfault when preparing BODYSTRUCTURE response #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/lib-imap/imap-bodystructure.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ part_write_bodystructure_data_common(struct message_part_body_data *data,
string_t *str)
{
str_append_c(str, ' ');
if (data->content_disposition == NULL)
if (!data || data->content_disposition == NULL)
str_append(str, "NIL");
else {
str_append_c(str, '(');
Expand All @@ -309,7 +309,7 @@ part_write_bodystructure_data_common(struct message_part_body_data *data,
}

str_append_c(str, ' ');
if (data->content_language == NULL)
if (!data || data->content_language == NULL)
str_append(str, "NIL");
else {
str_append_c(str, '(');
Expand All @@ -318,7 +318,11 @@ part_write_bodystructure_data_common(struct message_part_body_data *data,
}

str_append_c(str, ' ');
str_append(str, NVL(data->content_location, "NIL"));
if (!data || data->content_location == NULL)
str_append(str, "NIL");
else {
str_append(str, data->content_location);
}
}

static void part_write_body_multipart(const struct message_part *part,
Expand All @@ -336,7 +340,7 @@ static void part_write_body_multipart(const struct message_part *part,
}

str_append_c(str, ' ');
if (data->content_subtype != NULL)
if (data && data->content_subtype != NULL)
str_append(str, data->content_subtype);
else
str_append(str, "\"x-unknown\"");
Expand All @@ -346,7 +350,7 @@ static void part_write_body_multipart(const struct message_part *part,

/* BODYSTRUCTURE data */
str_append_c(str, ' ');
if (data->content_type_params == NULL)
if (!data || data->content_type_params == NULL)
str_append(str, "NIL");
else {
str_append_c(str, '(');
Expand Down