From nobody Tue Nov 18 01:23:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606903277; cv=none; d=zohomail.com; s=zohoarc; b=PSnW8qgt/3vkO77gHE54ACFsIGnm9h8sZprJTOC98uPSa9yjgkqIqRNY0OZGtlcBidSiS0pLN7U03LjakNztqIn3sYCUNpUtSFlWrZjPmFO+si1vV504DEUECx2Rcau2kGlzZ/3pnGOWDL4R4pxMN+B/aUe3NFDnS32xKnWn/hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606903277; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w/ft4yHW6Gu6rk+/3kyhPjUQ5KEBud0S4dG0X/WbxI0=; b=WoZgAykU7eDtmMSg+45op5JECyPO7JY5H5sUXMQgnP5OiWxAX12JxzQh+EYSpH7OGElLiTIJXYTT/73r37YOcMXwBcYm82kgqGmSkcCY3QYN4JOtmQyz8UMvqyRPo56oHbxJp2ixrvVo1Cw0FP0HUa596TNR/7mS532ZhIQFqlo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606903277533311.49239413458884; Wed, 2 Dec 2020 02:01:17 -0800 (PST) Received: from localhost ([::1]:42930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkOwl-0003SM-FA for importer@patchew.org; Wed, 02 Dec 2020 05:01:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkO3j-0003gz-FR for qemu-devel@nongnu.org; Wed, 02 Dec 2020 04:04:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkO3e-0004dz-K5 for qemu-devel@nongnu.org; Wed, 02 Dec 2020 04:04:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-427-zZsWiMgPPJWFsWCZKKxWeg-1; Wed, 02 Dec 2020 04:04:15 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79380922D3C; Wed, 2 Dec 2020 09:03:41 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03A755B6AB; Wed, 2 Dec 2020 09:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606899857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w/ft4yHW6Gu6rk+/3kyhPjUQ5KEBud0S4dG0X/WbxI0=; b=RMoWowCj02QlEOPNy97QoFDRZ8NmUUIGy6WwuXGmpa5C/9F212eBSPtiqgcw1VZxcqAAIo yeRgiufKvjgTq48IXwIkv6nMmeDgf46zHlJ7sek65f5/qXa7msq3RVO8fIevltGYiNaSEL Fv5VaBt54UBrrxBD97HAHObnI8K1FQc= X-MC-Unique: zZsWiMgPPJWFsWCZKKxWeg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/28] keyval: simplify keyval_parse_one Date: Wed, 2 Dec 2020 04:02:44 -0500 Message-Id: <20201202090305.4129317-8-pbonzini@redhat.com> In-Reply-To: <20201202090305.4129317-1-pbonzini@redhat.com> References: <20201202090305.4129317-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, imammedo@redhat.com, armbru@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Now that the key is NULL terminated, we can remove some of the contortions that were done to operate on possibly '=3D'-terminated strings in keyval_parse_one. Signed-off-by: Paolo Bonzini --- util/keyval.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/util/keyval.c b/util/keyval.c index eb9b9c55ec..e7f708cd1e 100644 --- a/util/keyval.c +++ b/util/keyval.c @@ -170,11 +170,10 @@ static QObject *keyval_parse_put(QDict *cur, * * On return: * - either NUL or the separator (comma or equal sign) is returned. - * - the length of the string is stored in @len. * - @start is advanced to either the NUL or the first character past the * separator. */ -static char keyval_fetch_string(char **start, size_t *len, bool key) +static char keyval_fetch_string(char **start, bool key) { char sep; char *p, *unescaped; @@ -197,7 +196,6 @@ static char keyval_fetch_string(char **start, size_t *l= en, bool key) } =20 *unescaped =3D 0; - *len =3D unescaped - *start; *start =3D p; return sep; } @@ -219,7 +217,7 @@ static char *keyval_parse_one(QDict *qdict, char *param= s, const char *implied_key, bool *help, Error **errp) { - const char *key, *key_end, *s, *end; + const char *key, *s, *end; const char *val =3D NULL; char sep; size_t len; @@ -229,8 +227,8 @@ static char *keyval_parse_one(QDict *qdict, char *param= s, QObject *next; =20 key =3D params; - sep =3D keyval_fetch_string(¶ms, &len, true); - if (!len) { + sep =3D keyval_fetch_string(¶ms, true); + if (!*key) { if (sep) { error_setg(errp, "Expected parameter before '%c%s'", sep, para= ms); } else { @@ -247,13 +245,11 @@ static char *keyval_parse_one(QDict *qdict, char *par= ams, /* Desugar implied key */ val =3D key; key =3D implied_key; - len =3D strlen(implied_key); } else { error_setg(errp, "No implicit parameter name for value '%s'", = key); return NULL; } } - key_end =3D key + len; =20 /* * Loop over key fragments: @s points to current fragment, it @@ -269,24 +265,21 @@ static char *keyval_parse_one(QDict *qdict, char *par= ams, ret =3D parse_qapi_name(s, false); len =3D ret < 0 ? 0 : ret; } - assert(s + len <=3D key_end); - if (!len || (s + len < key_end && s[len] !=3D '.')) { + if (!len || (s[len] !=3D '\0' && s[len] !=3D '.')) { assert(key !=3D implied_key); - error_setg(errp, "Invalid parameter '%.*s'", - (int)(key_end - key), key); + error_setg(errp, "Invalid parameter '%s'", key); return NULL; } if (len >=3D sizeof(key_in_cur)) { assert(key !=3D implied_key); error_setg(errp, "Parameter%s '%.*s' is too long", - s !=3D key || s + len !=3D key_end ? " fragment" : = "", + s !=3D key || s[len] =3D=3D '.' ? " fragment" : "", (int)len, s); return NULL; } =20 if (s !=3D key) { - next =3D keyval_parse_put(cur, key_in_cur, NULL, - key, s - 1, errp); + next =3D keyval_parse_put(cur, key_in_cur, NULL, key, s - 1, e= rrp); if (!next) { return NULL; } @@ -301,9 +294,9 @@ static char *keyval_parse_one(QDict *qdict, char *param= s, =20 if (key !=3D implied_key) { val =3D params; - keyval_fetch_string(¶ms, &len, false); + keyval_fetch_string(¶ms, false); } - if (!keyval_parse_put(cur, key_in_cur, val, key, key_end, errp)) { + if (!keyval_parse_put(cur, key_in_cur, val, key, s - 1, errp)) { return NULL; } return params; --=20 2.26.2