Tweak handling of invalid multibyte characters, preventing some hangs.vte_0_3_24

* src/vte.c: Tweak handling of invalid multibyte characters, preventing
	some hangs.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/vte.c b/src/vte.c
index b3cdcad..600e074 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -5025,11 +5025,9 @@ vte_terminal_process_incoming(gpointer data)
 
 	/* Convert the data to wide characters. */
 	if (g_iconv(terminal->pvt->incoming_conv, &ibuf, &icount,
-		  &obuf, &ocount) == -1) {
+		    &obuf, &ocount) == -1) {
 		/* No dice.  Try again when we have more data. */
-		if ((icount > VTE_UTF8_BPC) &&
-		    (icount < terminal->pvt->n_incoming) &&
-		    (errno == EILSEQ)) {
+		if ((icount > VTE_UTF8_BPC) && (errno == EILSEQ)) {
 			/* We barfed on something that had a high bit, so
 			 * discard it. */
 			start = terminal->pvt->n_incoming - icount;
diff --git a/vte.spec b/vte.spec
index 4fa0246..e9cbc78 100644
--- a/vte.spec
+++ b/vte.spec
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.3.23
+Version: 0.3.24
 Release: 1
 Summary: An experimental terminal emulator.
 License: LGPL
@@ -53,6 +53,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jun  3 2002 Nalin Dahyabhai <nalin@redhat.com> 0.3.24-1
+- tweak handling of invalid sequences again
+
 * Fri May 31 2002 Nalin Dahyabhai <nalin@redhat.com> 0.3.23-1
 - switch to g_convert (again?)
 - fix use of core fonts