# HG changeset patch
# User eugeni
# Date 1212086121 0
# Node ID 29e92a7a75b6e007b5a57daf0668679ec8428962
# Parent  80bf10a56b7e555106fec46159c6fb45d68710f7
Clear iconv conversion state also in libass.

diff -r 80bf10a56b7e -r 29e92a7a75b6 libass/ass.c
--- a/libass/ass.c	Thu May 29 18:35:18 2008 +0000
+++ b/libass/ass.c	Thu May 29 18:35:21 2008 +0000
@@ -846,13 +846,19 @@
 		char* ip;
 		char* op;
 		size_t rc;
+		int clear = 0;
 		
 		outbuf = malloc(size);
 		ip = data;
 		op = outbuf;
 		
-		while (ileft) {
-			rc = iconv(icdsc, &ip, &ileft, &op, &oleft);
+		while (1) {
+			if (ileft)
+				rc = iconv(icdsc, &ip, &ileft, &op, &oleft);
+			else {// clear the conversion state and leave
+				clear = 1;
+				rc = iconv(icdsc, NULL, NULL, &op, &oleft);
+			}
 			if (rc == (size_t)(-1)) {
 				if (errno == E2BIG) {
 					size_t offset = op - outbuf;
@@ -864,7 +870,9 @@
 					mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorRecodingFile);
 					return NULL;
 				}
-			}
+			} else
+				if (clear)
+					break;
 		}
 		outbuf[osize - oleft - 1] = 0;
 	}