From nobody Wed Nov 5 10:43:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533731853183859.4170197357553; Wed, 8 Aug 2018 05:37:33 -0700 (PDT) Received: from localhost ([::1]:43369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnNiW-0002Eh-1s for importer@patchew.org; Wed, 08 Aug 2018 08:37:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnNBp-0006jd-Sq for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnNBj-0008TM-6k for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:03:45 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45378 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnNBi-0008Rc-SR for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:03:39 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E10B81663F3; Wed, 8 Aug 2018 12:03:38 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-62.ams2.redhat.com [10.36.117.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 35EC31C72F; Wed, 8 Aug 2018 12:03:38 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5AC3911386B9; Wed, 8 Aug 2018 14:03:34 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 14:02:57 +0200 Message-Id: <20180808120334.10970-20-armbru@redhat.com> In-Reply-To: <20180808120334.10970-1-armbru@redhat.com> References: <20180808120334.10970-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 08 Aug 2018 12:03:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 08 Aug 2018 12:03:38 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 19/56] json: Tighten and simplify qstring_from_escaped_str()'s loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Simplify loop control, and assert that the string ends with the appropriate quote (the lexer ensures it does). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- 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(JSONParserCo= ntext *ctxt, { const char *ptr =3D token->str; QString *str; - int double_quote =3D 1; - - if (*ptr =3D=3D '"') { - double_quote =3D 1; - } else { - double_quote =3D 0; - } - ptr++; + char quote; =20 + assert(*ptr =3D=3D '"' || *ptr =3D=3D '\''); + quote =3D *ptr; str =3D qstring_new(); - while (*ptr &&=20 - ((double_quote && *ptr !=3D '"') || (!double_quote && *ptr !=3D= '\''))) { + + while (*++ptr !=3D quote) { + assert(*ptr); if (*ptr =3D=3D '\\') { - 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 =3D 0; char utf8_char[4]; int i =3D 0; =20 - ptr++; - for (i =3D 0; i < 4; i++) { + ptr++; if (qemu_isxdigit(*ptr)) { unicode_char |=3D hex2decimal(*ptr) << ((3 - i) * = 4); } else { @@ -199,7 +183,6 @@ static QString *qstring_from_escaped_str(JSONParserCont= ext *ctxt, "invalid hex escape sequence in string= "); goto out; } - ptr++; } =20 wchar_to_utf8(unicode_char, utf8_char, sizeof(utf8_char)); @@ -212,7 +195,7 @@ static QString *qstring_from_escaped_str(JSONParserCont= ext *ctxt, } else { char dummy[2]; =20 - dummy[0] =3D *ptr++; + dummy[0] =3D *ptr; dummy[1] =3D 0; =20 qstring_append(str, dummy); --=20 2.17.1