You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2006/11/10 20:47:24 UTC

svn commit: r473450 - in /apr/apr-iconv/branches/0.9.x: CHANGES ces/iso-10646-ucs-2.c

Author: wrowe
Date: Fri Nov 10 11:47:23 2006
New Revision: 473450

URL: http://svn.apache.org/viewvc?view=rev&rev=473450
Log:
Correct from_ucs zero width joiner/byte order mark, to be injected
only at the *start* of stream (when state is still 0).
  
PR: 24387 
Submitted by: Kohn Emil Dan <emild cs.technion.ac.il>
Backport: 473449

Modified:
    apr/apr-iconv/branches/0.9.x/CHANGES
    apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c

Modified: apr/apr-iconv/branches/0.9.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-iconv/branches/0.9.x/CHANGES?view=diff&rev=473450&r1=473449&r2=473450
==============================================================================
--- apr/apr-iconv/branches/0.9.x/CHANGES (original)
+++ apr/apr-iconv/branches/0.9.x/CHANGES Fri Nov 10 11:47:23 2006
@@ -1,6 +1,8 @@
 Changes with APR-ICONV 0.9.8-dev
 
-
+  *) Correct from_ucs zero width joiner/byte order mark to be injected
+     only at the *start* of stream (when state is still 0).  
+     PR 24387 [Kohn Emil Dan <em...@cs.technion.ac.il>]
 
 Changes with APR-ICONV 0.9.7
 

Modified: apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c
URL: http://svn.apache.org/viewvc/apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c?view=diff&rev=473450&r1=473449&r2=473450
==============================================================================
--- apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c (original)
+++ apr/apr-iconv/branches/0.9.x/ces/iso-10646-ucs-2.c Fri Nov 10 11:47:23 2006
@@ -59,7 +59,7 @@
 	bytes = *state ? 2 : 4;
 	if (*outbytesleft < bytes)
 		return 0;	/* No space in the output buffer */
-	if (*state) {
+	if (*state == 0) {
 		*(*outbuf)++ = 0xFE;
 		*(*outbuf)++ = 0xFF;
 		*state = 1;