[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/56] json: Tighten and simplify qstring_from_escap
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 19/56] json: Tighten and simplify qstring_from_escaped_str()'s loop |
Date: |
Wed, 8 Aug 2018 14:02:57 +0200 |
Simplify loop control, and assert that the string ends with the
appropriate quote (the lexer ensures it does).
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/json-parser.c | 35 +++++++++--------------------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index a5aa790d62..e00405745f 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -132,66 +132,50 @@ static QString
*qstring_from_escaped_str(JSONParserContext *ctxt,
{
const char *ptr = token->str;
QString *str;
- int double_quote = 1;
-
- if (*ptr == '"') {
- double_quote = 1;
- } else {
- double_quote = 0;
- }
- ptr++;
+ char quote;
+ assert(*ptr == '"' || *ptr == '\'');
+ quote = *ptr;
str = qstring_new();
- while (*ptr &&
- ((double_quote && *ptr != '"') || (!double_quote && *ptr != '\'')))
{
+
+ while (*++ptr != quote) {
+ assert(*ptr);
if (*ptr == '\\') {
- ptr++;
-
- switch (*ptr) {
+ switch (*++ptr) {
case '"':
qstring_append(str, "\"");
- ptr++;
break;
case '\'':
qstring_append(str, "'");
- ptr++;
break;
case '\\':
qstring_append(str, "\\");
- ptr++;
break;
case '/':
qstring_append(str, "/");
- ptr++;
break;
case 'b':
qstring_append(str, "\b");
- ptr++;
break;
case 'f':
qstring_append(str, "\f");
- ptr++;
break;
case 'n':
qstring_append(str, "\n");
- ptr++;
break;
case 'r':
qstring_append(str, "\r");
- ptr++;
break;
case 't':
qstring_append(str, "\t");
- ptr++;
break;
case 'u': {
uint16_t unicode_char = 0;
char utf8_char[4];
int i = 0;
- ptr++;
-
for (i = 0; i < 4; i++) {
+ ptr++;
if (qemu_isxdigit(*ptr)) {
unicode_char |= hex2decimal(*ptr) << ((3 - i) * 4);
} else {
@@ -199,7 +183,6 @@ static QString *qstring_from_escaped_str(JSONParserContext
*ctxt,
"invalid hex escape sequence in string");
goto out;
}
- ptr++;
}
wchar_to_utf8(unicode_char, utf8_char, sizeof(utf8_char));
@@ -212,7 +195,7 @@ static QString *qstring_from_escaped_str(JSONParserContext
*ctxt,
} else {
char dummy[2];
- dummy[0] = *ptr++;
+ dummy[0] = *ptr;
dummy[1] = 0;
qstring_append(str, dummy);
--
2.17.1
- Re: [Qemu-devel] [PATCH 21/56] json: Reject invalid UTF-8 sequences, (continued)
- [Qemu-devel] [PATCH 38/56] json: Pass lexical errors and limit violations to callback, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 37/56] json: Treat unwanted interpolation as lexical error, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 42/56] json: Improve names of lexer states related to numbers, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 50/56] json: Unbox tokens queue in JSONMessageParser, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 19/56] json: Tighten and simplify qstring_from_escaped_str()'s loop,
Markus Armbruster <=
- [Qemu-devel] [PATCH 36/56] json: Rename token JSON_ESCAPE & friends to JSON_INTERPOL, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 32/56] json: Have lexer call streamer directly, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 45/56] json: Fix streamer not to ignore trailing unterminated structures, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 25/56] json: Leave rejecting invalid escape sequences to parser, Markus Armbruster, 2018/08/08