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/bytevectors.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/bytevectors.c')
-rw-r--r-- | libguile/bytevectors.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c index db132d43f..4ce90ebdf 100644 --- a/libguile/bytevectors.c +++ b/libguile/bytevectors.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +/* Copyright (C) 2009, 2010, 2011, 2012, 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 @@ -2050,8 +2050,7 @@ SCM_DEFINE (scm_utf8_to_string, "utf8->string", c_utf_len = SCM_BYTEVECTOR_LENGTH (utf); c_utf = (char *) SCM_BYTEVECTOR_CONTENTS (utf); - str = scm_from_stringn (c_utf, c_utf_len, "UTF-8", - SCM_FAILED_CONVERSION_ERROR); + str = scm_from_utf8_stringn (c_utf, c_utf_len); return (str); } |