[vte/vte-0-36] iconv: Don't drop incomplete UTF-8 before control characters

[Egmont Koblinger <egmontkob src gnome org>]

commit 2e4d2814140cbeb6267871e6b66f9571e7d5b8c7
Author: Egmont Koblinger <egmont gmail com>
Date:   Tue Jan 7 19:35:56 2014 +0100

    iconv: Don't drop incomplete UTF-8 before control characters
    
    https://bugzilla.gnome.org/show_bug.cgi?id=720977

 src/iso2022.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/iso2022.c b/src/iso2022.c
index 6856689..bfd0120 100644
--- a/src/iso2022.c
+++ b/src/iso2022.c
@@ -1156,7 +1156,7 @@ process_8_bit_sequence(struct _vte_iso2022_state *state,
 
 static glong
 process_cdata(struct _vte_iso2022_state *state, const guchar *cdata, gsize length,
-             GArray *gunichars)
+             gboolean incomplete_is_invalid, GArray *gunichars)
 {
        int ambiguous_width;
        glong processed = 0;
@@ -1197,6 +1197,9 @@ process_cdata(struct _vte_iso2022_state *state, const guchar *cdata, gsize lengt
                        stop = FALSE;
                        switch (converted) {
                        case ((gsize)-1):
+                               if (errno == EINVAL && incomplete_is_invalid) {
+                                       errno = EILSEQ;
+                               }
                                switch (errno) {
                                case EILSEQ:
                                        /* Check if it's an 8-bit sequence. */
@@ -1627,6 +1630,7 @@ process_block (struct _vte_iso2022_state *state,
               guchar *input,
               struct _vte_iso2022_block *block,
               gboolean last,
+              gboolean incomplete_is_invalid,
               GArray *gunichars)
 {
        guint preserve_last = -1;
@@ -1660,6 +1664,7 @@ process_block (struct _vte_iso2022_state *state,
                                          block->end -
                                          block->start -
                                          initial,
+                                         incomplete_is_invalid,
                                          gunichars);
                        if (j == 0) {
                                break;
@@ -1715,6 +1720,7 @@ _vte_iso2022_process(struct _vte_iso2022_state *state,
                        preserve_last = process_block (state,
                                                       input, &block,
                                                       TRUE,
+                                                      FALSE,
                                                       gunichars);
                        break;
                }
@@ -1723,7 +1729,7 @@ _vte_iso2022_process(struct _vte_iso2022_state *state,
                        block.type = _vte_iso2022_cdata;
                        block.start = p - input;
                        block.end = nextctl - input;
-                       process_block (state, input, &block, FALSE, gunichars);
+                       process_block (state, input, &block, FALSE, TRUE, gunichars);
                }
                /* Move on to the control data. */
                p = nextctl;
@@ -1758,6 +1764,7 @@ _vte_iso2022_process(struct _vte_iso2022_state *state,
                preserve_last = process_block (state,
                                               input, &block,
                                               FALSE,
+                                              FALSE,
                                               gunichars);
        } while (p < q);
        if (preserve_last != (guint) -1) {