From nobody Mon Feb 9 17:24:06 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685657223; cv=none; d=zohomail.com; s=zohoarc; b=Ie4/VrnjdFMCY4ZpHUNeAlD0w9V7ZfeQOR3isetbpmrP/VEtQ1T0PN2JQoM3/kH901soXeA7KgdPwq702/hKYUcynBQPeBGZyFZmwNznXmRuQBCKGffbgIYlpQ6CO2p+eQKYE69laIWJSCNlCAsoE0gZbMwPJfaeyyf8aUMIOkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685657223; 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=GyTl+Ld/Oi1vtUXKnleRiAn3DZZk9c0a1qdSLdUY6R8=; b=KnwZAf4MsjYWY9KOO/1MH1qw67ZQWBV2jYWhLJBy4C3pxH/fkesu3/JXThZV8OLm9N9sbxGgIBwuQnbrcz7sFfc+PziGDPrn0rSsq/p181J+kc/yR7XNT4i3U2SId13tHlrJCuZdJtMKpxKSqbSObLbiyIsT+7QhWE1+d2JpX/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1685657223540335.7175016428116; Thu, 1 Jun 2023 15:07:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4qOe-0008B5-7w; Thu, 01 Jun 2023 18:03:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4qOG-00081g-FC for qemu-devel@nongnu.org; Thu, 01 Jun 2023 18:03:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4qO8-000412-2E for qemu-devel@nongnu.org; Thu, 01 Jun 2023 18:03:27 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-V2LBeceNM46R3_QJpAyTkg-1; Thu, 01 Jun 2023 18:03:18 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 07A3D8007D9; Thu, 1 Jun 2023 22:03:18 +0000 (UTC) Received: from green.redhat.com (unknown [10.2.16.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA562492B0A; Thu, 1 Jun 2023 22:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685656999; 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=GyTl+Ld/Oi1vtUXKnleRiAn3DZZk9c0a1qdSLdUY6R8=; b=jTPhGhTawNV9x8AcO+a10xO6/74g3w9LfgZOPgmNfcAL9TTMecSQqHBc4DKIbO+81UdRZB x7v6PJAv7oe7rmf5XgjdyPb+2g3EHCLJidwgZ+Ardia2bo0+tNe2zXLs1OGOSFYvqWK0r4 go1ltdX8PT5xpaC3YF4dvV548IoQzsw= X-MC-Unique: V2LBeceNM46R3_QJpAyTkg-1 From: Eric Blake To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Czenczek Subject: [PULL 14/21] cutils: Allow NULL str in qemu_strtosz Date: Thu, 1 Jun 2023 17:02:58 -0500 Message-Id: <20230601220305.2130121-15-eblake@redhat.com> In-Reply-To: <20230601220305.2130121-1-eblake@redhat.com> References: <20230601220305.2130121-1-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.166, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685657224854100001 All the other qemu_strto* and parse_uint allow a NULL str. Having qemu_strtosz not crash on qemu_strtosz(NULL, NULL, &value) is an easy fix that adds some consistency between our string parsers. Signed-off-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Hanna Czenczek Message-Id: <20230522190441.64278-13-eblake@redhat.com> --- tests/unit/test-cutils.c | 10 +++++++++- util/cutils.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 96bc9d1f202..26e3ba4b9f3 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -3285,7 +3285,12 @@ static void do_strtosz_full(const char *str, qemu_st= rtosz_fn fn, ret =3D fn(str, &endptr, &val); g_assert_cmpint(ret, =3D=3D, exp_ptr_ret); g_assert_cmpuint(val, =3D=3D, exp_ptr_val); - g_assert_true(endptr =3D=3D str + exp_ptr_offset); + if (str) { + g_assert_true(endptr =3D=3D str + exp_ptr_offset); + } else { + g_assert_cmpint(exp_ptr_offset, =3D=3D, 0); + g_assert_null(endptr); + } val =3D 0xbaadf00d; ret =3D fn(str, NULL, &val); @@ -3383,6 +3388,9 @@ static void test_qemu_strtosz_float(void) static void test_qemu_strtosz_invalid(void) { + do_strtosz(NULL, -EINVAL, 0xbaadf00d, 0); + + /* Must parse at least one digit */ do_strtosz("", -EINVAL, 0xbaadf00d, 0); do_strtosz(" \t ", -EINVAL, 0xbaadf00d, 0); do_strtosz("crap", -EINVAL, 0xbaadf00d, 0); diff --git a/util/cutils.c b/util/cutils.c index 56a2aced8d4..1dc67d201dc 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -306,7 +306,7 @@ static int do_strtosz(const char *nptr, const char **en= d, out: if (end) { *end =3D endptr; - } else if (*endptr) { + } else if (nptr && *endptr) { retval =3D -EINVAL; } if (retval =3D=3D 0) { --=20 2.40.1