system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-07 00:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: fix unicode decoding in unquote_first_word()

Browse source
This commit is contained in:
Lennart Poettering 2015-04-10 11:56:04 +02:00
parent f3ee629711
commit 8ebac1f9a6
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/shared/util.c
View file

@ -7284,7 +7284,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
return -EINVAL;
}
if (!GREEDY_REALLOC(s, allocated, sz+2))
if (!GREEDY_REALLOC(s, allocated, sz+7))
return -ENOMEM;
if (flags & UNQUOTE_CUNESCAPE) {
@ -7299,7 +7299,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
if (c != 0)
s[sz++] = c; /* normal explicit char */
else
sz += utf8_encode_unichar(s, u); /* unicode chars we'll encode as utf8 */
sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */
} else
s[sz++] = c;
@ -7331,7 +7331,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
return -EINVAL;
}
if (!GREEDY_REALLOC(s, allocated, sz+2))
if (!GREEDY_REALLOC(s, allocated, sz+7))
return -ENOMEM;
if (flags & UNQUOTE_CUNESCAPE) {
@ -7346,7 +7346,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
if (c != 0)
s[sz++] = c;
else
sz += utf8_encode_unichar(s, u);
sz += utf8_encode_unichar(s + sz, u);
} else
s[sz++] = c;
@ -7376,7 +7376,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
return -EINVAL;
}
if (!GREEDY_REALLOC(s, allocated, sz+2))
if (!GREEDY_REALLOC(s, allocated, sz+7))
return -ENOMEM;
if (flags & UNQUOTE_CUNESCAPE) {
@ -7391,7 +7391,7 @@ int unquote_first_word(const char **p, char **ret, UnquoteFlags flags) {
if (c != 0)
s[sz++] = c;
else
sz += utf8_encode_unichar(s, u);
sz += utf8_encode_unichar(s + sz, u);
} else
s[sz++] = c;

11
src/test/test-util.c
View file

@ -1376,6 +1376,17 @@ static void test_unquote_first_word(void) {
assert_se(streq(t, "foobax6ar"));
free(t);
assert_se(p == original + 13);
p = original = " f\\u00f6o \"pi\\U0001F4A9le\" ";
assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE) > 0);
assert_se(streq(t, "föo"));
free(t);
assert_se(p == original + 13);
assert_se(unquote_first_word(&p, &t, UNQUOTE_CUNESCAPE) > 0);
assert_se(streq(t, "pi\360\237\222\251le"));
free(t);
assert_se(p == original + 32);
}
static void test_unquote_many_words(void) {