diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2008-11-18 22:36:06 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-11-18 22:36:06 +0000 |
| commit | 3253fc62b5a904fb53f94cea662156467e82803a (patch) | |
| tree | 085afd1fe36a66e45fa79fba9a0745a2984a3e8c | |
| parent | 444aba803d58c7e96ab505a1e11647309cc84e65 (diff) | |
| download | iconv-3253fc62b5a904fb53f94cea662156467e82803a.tar.gz iconv-3253fc62b5a904fb53f94cea662156467e82803a.tar.bz2 | |
Change previous logic -- we want to ignore U+FFFF regardless of the translit state.
svn path=/trunk/iconv/; revision=5717
| -rw-r--r-- | src/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/iconv.c b/src/iconv.c index 800ece2..80d4caa 100644 --- a/src/iconv.c +++ b/src/iconv.c @@ -418,7 +418,7 @@ int character_callback(void *handle, UCS4 c) /* Stop on invalid characters if we're not transliterating */ /** \todo is this sane? -- we can't distinguish between illegal input * or valid input which just happens to correspond with U+fffd. */ - if ((c == 0xFFFD || c == 0xFFFF) && !e->transliterate) { + if ((c == 0xFFFD && !e->transliterate) || c == 0xFFFF) { e->write_state = WRITE_FAILED; return 1; } |