picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

utf8: when escaping unprintable unichars, escape the whole unichar, not just the first byte of it

Browse source
This commit is contained in:
Lennart Poettering 2014-12-04 02:27:14 +01:00
parent 3f18c60b2e
commit 3c6d3052d3
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/shared/utf8.c
View file

@ -202,7 +202,7 @@ char *utf8_escape_invalid(const char *str) {
s = mempcpy(s, str, len);
str += len;
} else {
s = mempcpy(s, UTF8_REPLACEMENT_CHARACTER, strlen(UTF8_REPLACEMENT_CHARACTER));
s = stpcpy(s, UTF8_REPLACEMENT_CHARACTER);
str += 1;
}
}
@ -230,18 +230,18 @@ char *utf8_escape_non_printable(const char *str) {
s = mempcpy(s, str, len);
str += len;
} else {
if ((*str < ' ') || (*str >= 127)) {
while (len > 0) {
*(s++) = '\\';
*(s++) = 'x';
*(s++) = hexchar((int) *str >> 4);
*(s++) = hexchar((int) *str);
} else
*(s++) = *str;
str += 1;
str += 1;
len --;
}
}
} else {
s = mempcpy(s, UTF8_REPLACEMENT_CHARACTER, strlen(UTF8_REPLACEMENT_CHARACTER));
s = stpcpy(s, UTF8_REPLACEMENT_CHARACTER);
str += 1;
}
}

7
src/test/test-utf8.c
View file

@ -47,7 +47,6 @@ static void test_utf8_encoded_valid_unichar(void) {
assert_se(utf8_encoded_valid_unichar("a") == 1);
assert_se(utf8_encoded_valid_unichar("\341\204") < 0);
assert_se(utf8_encoded_valid_unichar("\341\204\341\204") < 0);
}
static void test_utf8_escaping(void) {
@ -67,7 +66,7 @@ static void test_utf8_escaping(void) {
}
static void test_utf8_escaping_printable(void) {
_cleanup_free_ char *p1, *p2, *p3, *p4, *p5;
_cleanup_free_ char *p1, *p2, *p3, *p4, *p5, *p6;
p1 = utf8_escape_non_printable("goo goo goo");
puts(p1);
@ -88,6 +87,10 @@ static void test_utf8_escaping_printable(void) {
p5 = utf8_escape_non_printable("\001 \019\20\a");
puts(p5);
assert_se(utf8_is_valid(p5));
p6 = utf8_escape_non_printable("\xef\xbf\x30\x13");
puts(p6);
assert_se(utf8_is_valid(p6));
}
int main(int argc, char *argv[]) {