[geary/cherry-pick-0e269a35] Merge branch 'fix-725' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 9ac029c6c682b50197fb697192821b2249b16e2c
Author: Michael Gratton <mike vee net>
Date:   Tue Mar 17 04:44:26 2020 +0000

    Merge branch 'fix-725' into 'mainline'
    
    Make g_mime_filter_filter implementations more robust (closes #725)
    
    Closes #725
    
    See merge request GNOME/geary!436
    
    (cherry picked from commit 0e269a353b952b5b0c85bcd90a4a42a815e5c06a)
    
    dd053ebf Make g_mime_filter_filter implementations more robust (closes #725)

 src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala | 6 +++---
 src/engine/rfc822/rfc822-gmime-filter-flowed.vala      | 4 ++--
 src/engine/rfc822/rfc822-gmime-filter-plain.vala       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala 
b/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
index 6f8c118f..8cf7563d 100644
--- a/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
+++ b/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
@@ -49,7 +49,7 @@ private class Geary.RFC822.FilterBlockquotes : GMime.Filter {
         return new_filter;
     }
 
-    private void do_filter(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    private void do_filter([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, [CCode 
(array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace, bool flush) {
 
         // This may not be strictly necessary.
@@ -122,12 +122,12 @@ private class Geary.RFC822.FilterBlockquotes : GMime.Filter {
         outprespace = this.outpre;
     }
 
-    public override void filter(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    public override void filter([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, [CCode 
(array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace) {
         do_filter(inbuf, prespace, out processed_buffer, out outprespace, false);
     }
 
-    public override void complete(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    public override void complete([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, 
[CCode (array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace) {
         do_filter(inbuf, prespace, out processed_buffer, out outprespace, true);
     }
diff --git a/src/engine/rfc822/rfc822-gmime-filter-flowed.vala 
b/src/engine/rfc822/rfc822-gmime-filter-flowed.vala
index d018c537..ffa19009 100644
--- a/src/engine/rfc822/rfc822-gmime-filter-flowed.vala
+++ b/src/engine/rfc822/rfc822-gmime-filter-flowed.vala
@@ -57,7 +57,7 @@ private class Geary.RFC822.FilterFlowed : GMime.Filter {
         return new_filter;
     }
 
-    public override void filter(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    public override void filter([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, [CCode 
(array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace) {
 
         // Worst-case scenario: We are about to leave the prefix,
@@ -147,7 +147,7 @@ private class Geary.RFC822.FilterFlowed : GMime.Filter {
         outprespace = this.outpre;
     }
 
-    public override void complete(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    public override void complete([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, 
[CCode (array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace) {
         filter(inbuf, prespace, out processed_buffer, out outprespace);
     }
diff --git a/src/engine/rfc822/rfc822-gmime-filter-plain.vala 
b/src/engine/rfc822/rfc822-gmime-filter-plain.vala
index b38baac0..36c970df 100644
--- a/src/engine/rfc822/rfc822-gmime-filter-plain.vala
+++ b/src/engine/rfc822/rfc822-gmime-filter-plain.vala
@@ -26,7 +26,7 @@ private class Geary.RFC822.FilterPlain : GMime.Filter {
         return new_filter;
     }
 
-    public override void filter(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    public override void filter([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, [CCode 
(array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace) {
 
         // This may not be strictly necessary.
@@ -56,7 +56,7 @@ private class Geary.RFC822.FilterPlain : GMime.Filter {
         outprespace = this.outpre;
     }
 
-    public override void complete(uint8[] inbuf, size_t prespace, out unowned uint8[] processed_buffer,
+    public override void complete([CCode (array_length_type = "gsize")] uint8[] inbuf, size_t prespace, 
[CCode (array_length_type = "gsize")] out unowned uint8[] processed_buffer,
         out size_t outprespace) {
         filter(inbuf, prespace, out processed_buffer, out outprespace);
     }