mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 01:43:36 +01:00
Code Issues Projects Releases Wiki Activity

ccan: update ccan/utf-8 to reject NULs embedded in strings.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-12-01 11:08:15 +10:30
parent c29e290ee6
commit ae1a130ab5
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccan/README
View File

@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.
CCAN version: init-2502-gb45a3266
CCAN version: init-2503-g56d5c41f

4
ccan/ccan/utf8/test/run-decode.c
View File

@ -117,7 +117,7 @@ test_unicode_scalar_value(void) {
char src[4];
/* Unicode scalar value [U+0000, U+007F] */
for (ord = 0x0000; ord <= 0x007F; ord++) {
for (ord = 0x0001; ord <= 0x007F; ord++) {
encode_ord(ord, 1, src);
TEST_UTF8(src, 1, ord ? 0 : ERANGE);
}
@ -255,7 +255,7 @@ test_continuations(void) {
int
main(int argc, char **argv)
{
plan_tests(2190906);
plan_tests(2190906 - 1);
test_unicode_scalar_value();
test_surrogates();
test_non_shortest_form();

2
ccan/ccan/utf8/utf8.c
View File

@ -63,6 +63,8 @@ bool utf8_decode(struct utf8_state *utf8_state, char c)
/* First character in sequence. */
if (((unsigned char)c & 0x80) == 0) {
/* ASCII, easy. */
if (c == 0)
goto bad_encoding;
utf8_state->total_len = 1;
utf8_state->c = c;
goto finished_decoding;

2
ccan/ccan/utf8/utf8.h
View File

@ -33,7 +33,7 @@ static inline void utf8_state_init(struct utf8_state *utf8_state)
* Otherwise returns true, @utf8_state can be reused without initializeation,
* and sets errno:
* 0: success
* EINVAL: bad encoding.
* EINVAL: bad encoding (including a NUL character).
* EFBIG: not a minimal encoding.
* ERANGE: encoding of invalid character.
*