Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lneTi-0005se-0m for mharc-qemu-trivial@gnu.org; Mon, 31 May 2021 05:44:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lneTg-0005ri-IA for qemu-trivial@nongnu.org; Mon, 31 May 2021 05:44:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lneTd-0002ii-VN for qemu-trivial@nongnu.org; Mon, 31 May 2021 05:44:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622454292; 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=d7ei2Yef+nrEanID5IIIu3q7Yv5FZ4NajSOONXvN5gM=; b=VFEIsBwkm8guGNRqG9PIgy3uA0E3dsDoeuRrocFlBkYWh7/2Nb/ecs5tklnORyEaI5i9/+ TMkqqxjAlotiXXe3V7uDVK2vyAaUMu6ooGyrSwpkBPYzqyLp/ORR4Kc/zmQ1SrUCW6bVd8 dD/UrHhmsqLAMMOvT3HpaLktAYgK+Yg= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-55-P4fuAaoaMeOsBemXPwTMcA-1; Mon, 31 May 2021 05:44:51 -0400 X-MC-Unique: P4fuAaoaMeOsBemXPwTMcA-1 Received: by mail-wr1-f69.google.com with SMTP id z4-20020adfe5440000b0290114f89c9931so1538853wrm.17 for ; Mon, 31 May 2021 02:44:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=d7ei2Yef+nrEanID5IIIu3q7Yv5FZ4NajSOONXvN5gM=; b=AmUnKYOeC59XQceklxFm/FVIU53aK8RniNpxE3tq0t0iExV0br8Xrki7XUsdQ1PvHY 3hA95bzQk4XDwHZ1V8IyGtxiti3wLI16mIvjPMZsMe5fYDkVrQvvYchMA3WfxEcUFQoD HY7uV7LCw5INanunqFgHxjZO0G2VJULRIfdVR1l1druDe0aITulmwlSoOKSMP2wZfaqL gtshIrlID9EyqfLvuK/kOfVlDv2aAn3SSVsEctCaGw7FGXAbcVCak3ehCtG5Aqi6IaRp 2nR9A5lP3+EfC+eQNiRgPBgBPltwiY2PnaMsq8ODGutMIcbei9C9YPyk7Hj2dbJJ21se xyfw== X-Gm-Message-State: AOAM530tX6XVFpcc6YyQT1mLbrJWnw+C5Ga6k3KJ0pei71M85Sb7/OZo shq0J4l7fgOU/MO1kD/miMoMDxduSir9EcDMsiR7KQLNyzfrWP+nLPpLfMTCOFddTJS2Oy3Z9Mp VCiGX/mgjXhtixptH3eWeKip1BU6Hnz6ql6ebQQNHZrXxM0yVdj+FSRyRGpGHkne/nSA= X-Received: by 2002:adf:ce01:: with SMTP id p1mr8685344wrn.63.1622454289677; Mon, 31 May 2021 02:44:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwC8j8pHReddEYDvypvAVHC+oxdKDrw5YPOsOfVYVqC6dfMMoNHVihIW7OuX95ELzzzG2bVNw== X-Received: by 2002:adf:ce01:: with SMTP id p1mr8685315wrn.63.1622454289260; Mon, 31 May 2021 02:44:49 -0700 (PDT) Received: from [192.168.1.36] (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id q11sm17365214wrx.80.2021.05.31.02.44.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 May 2021 02:44:48 -0700 (PDT) Subject: Re: [PATCH] qobject: Fix maybe uninitialized in qdict_array_split To: Janosch Frank , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, cohuck@redhat.com, borntraeger@de.ibm.com, QEMU Trivial References: <20210518130638.54529-1-frankja@linux.ibm.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <97b11fa8-fd32-9f73-612b-dc4209e5b32e@redhat.com> Date: Mon, 31 May 2021 11:44:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.37, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.618, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2021 09:44:56 -0000 On 5/31/21 11:21 AM, Janosch Frank wrote: > On 5/18/21 3:06 PM, Janosch Frank wrote: >> Lets make the compiler happy. >> >> Signed-off-by: Janosch Frank > > Ping > My build is still breaking on Ubuntu because of this. > >> --- >> qobject/block-qdict.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c >> index 1487cc5dd8..b26524429c 100644 >> --- a/qobject/block-qdict.c >> +++ b/qobject/block-qdict.c >> @@ -224,7 +224,7 @@ void qdict_array_split(QDict *src, QList **dst) >> for (i = 0; i < UINT_MAX; i++) { >> QObject *subqobj; >> bool is_subqdict; >> - QDict *subqdict; >> + QDict *subqdict = NULL; >> char indexstr[32], prefix[32]; >> size_t snprintf_ret; Slightly clearer: -- >8 -- diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c index 1487cc5dd8b..8d0f00bc3ce 100644 --- a/qobject/block-qdict.c +++ b/qobject/block-qdict.c @@ -224,7 +224,6 @@ void qdict_array_split(QDict *src, QList **dst) for (i = 0; i < UINT_MAX; i++) { QObject *subqobj; bool is_subqdict; - QDict *subqdict; char indexstr[32], prefix[32]; size_t snprintf_ret; @@ -249,14 +248,16 @@ void qdict_array_split(QDict *src, QList **dst) } if (is_subqdict) { + QDict *subqdict = NULL; + qdict_extract_subqdict(src, &subqdict, prefix); assert(qdict_size(subqdict) > 0); + qlist_append_obj(*dst, QOBJECT(subqdict)); } else { qobject_ref(subqobj); qdict_del(src, indexstr); + qlist_append_obj(*dst, subqobj); } - - qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict)); } } --- Anyhow, Reviewed-by: Philippe Mathieu-Daudé Cc'ing qemu-trivial@