diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-01-15 11:01:10 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-01-15 11:01:10 +0100 |
| commit | 8c76a8971ba92ebdf657199b74506f607987b523 (patch) | |
| tree | f21c9b4418a2f0a990906897a372324576d5bc33 /libguile/symbols.c | |
| parent | b4fa6cc90961c87b28e26b469863f19a1be26ce2 (diff) | |
| download | guile-8c76a8971ba92ebdf657199b74506f607987b523.tar.gz | |
fix bug where scm_from_utf8_stringn would not detect bad utf-8
* libguile/strings.c (scm_from_utf8_stringn):
* libguile/symbols.c (utf8_string_equals_wide_string): The "bad UTF8"
return from u8_mbtouc is a 0xfffd character, not a negative byte
length. Fixes a bug in which invalid UTF-8 would not be caught.
* libguile/bytevectors.c (scm_utf8_to_string): Use scm_from_utf8_stringn
directly. Just a little cleanup.
* test-suite/tests/iconv.test ("narrow non-ascii string"): Add test for
parsing bad utf-8 with substitution.
Diffstat (limited to 'libguile/symbols.c')
| -rw-r--r-- | libguile/symbols.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/symbols.c b/libguile/symbols.c index fd7e21470..f93833b9d 100644 --- a/libguile/symbols.c +++ b/libguile/symbols.c @@ -1,5 +1,5 @@ /* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2004, - * 2006, 2009, 2011 Free Software Foundation, Inc. + * 2006, 2009, 2011, 2013 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -167,7 +167,7 @@ utf8_string_equals_wide_string (const scm_t_uint8 *narrow, size_t nlen, nbytes = u8_mbtouc (&c, narrow + byte_idx, nlen - byte_idx); if (nbytes == 0) break; - else if (nbytes < 0) + else if (c == 0xfffd) /* Bad UTF-8. */ return 0; else if (c != wide[char_idx]) |