summaryrefslogtreecommitdiff
path: root/libguile/strings.c
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-08-13 01:31:36 -0400
committerMark H Weaver <mhw@netris.org>2015-08-13 01:31:36 -0400
commit00884bb79fff41fdf5f22f24a74e366a94a14c9b (patch)
tree0657d80e334b16a592c51c3d5130ab415877fb0b /libguile/strings.c
parent48412395c6501d0f4f98494cfe20c1c18b14d7a6 (diff)
downloadguile-00884bb79fff41fdf5f22f24a74e366a94a14c9b.tar.gz
Allow decoding of UTF-8 containing U+FFFD, the replacement character.
* libguile/strings.c (scm_from_utf8_stringn): Use 'u8_mbtoucr' and check for a decoding error by its 'nbytes' return value. Previously we used 'u8_mbtouc' and improperly assumed that a U+FFFD character indicated a decoding error. * libguile/symbols.c (utf8_string_equals_wide_string): Likewise. * test-suite/tests/bytevectors.test (exception:decoding-error): New variable. ("2.9 Operations on Strings"): Add tests.
Diffstat (limited to 'libguile/strings.c')
-rw-r--r--libguile/strings.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/strings.c b/libguile/strings.c
index 90dc83a66..ee43e815e 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1998,2000,2001, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1998, 2000, 2001, 2004, 2006,
+ * 2008-2015 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
@@ -1673,9 +1674,9 @@ scm_from_utf8_stringn (const char *str, size_t len)
ascii = 0;
- nbytes = u8_mbtouc (&c, ustr + i, len - i);
+ nbytes = u8_mbtoucr (&c, ustr + i, len - i);
- if (c == 0xfffd)
+ if (nbytes < 0)
/* Bad UTF-8. */
decoding_error (__func__, errno, str, len);