[geary/cherry-pick-d0773078] Merge branch 'mjog/preview-regex-segfault' into 'mainline'
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/cherry-pick-d0773078] Merge branch 'mjog/preview-regex-segfault' into 'mainline'
- Date: Tue, 22 Oct 2019 03:22:38 +0000 (UTC)
commit 63f6bce9e16d0541d4bf94aeac8d52179fbc772b
Author: Michael Gratton <mike vee net>
Date: Tue Oct 22 03:21:00 2019 +0000
Merge branch 'mjog/preview-regex-segfault' into 'mainline'
Fix segfault on invalid UTF-8 when generating preview
See merge request GNOME/geary!340
(cherry picked from commit d0773078f060d980aef30be7f29cfe489351109d)
7bac77df Fix segfault on invalid UTF-8 when generating preview
src/engine/rfc822/rfc822-utils.vala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/src/engine/rfc822/rfc822-utils.vala b/src/engine/rfc822/rfc822-utils.vala
index 55a92061..37a967fb 100644
--- a/src/engine/rfc822/rfc822-utils.vala
+++ b/src/engine/rfc822/rfc822-utils.vala
@@ -248,7 +248,10 @@ public string to_preview_text(string? text, TextFormat format) {
preview = Geary.HTML.html_to_text(text, false);
}
- return Geary.String.reduce_whitespace(preview);
+ // XXX really shouldn't have to call make_valid here but do so to
+ // avoid segfaults in the regex engine on invalid char data. See
+ // issue #186 for the proper fix.
+ return Geary.String.reduce_whitespace(preview.make_valid());
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]