From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu5ze-0003eB-9Q for qemu-devel@nongnu.org; Mon, 09 Jun 2014 16:16:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wu5zY-0002f4-Mx for qemu-devel@nongnu.org; Mon, 09 Jun 2014 16:16:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wu5zY-0002eQ-Eh for qemu-devel@nongnu.org; Mon, 09 Jun 2014 16:16:28 -0400 Date: Mon, 9 Jun 2014 16:15:48 -0400 From: Luiz Capitulino Message-ID: <20140609161548.2cc1829e@redhat.com> In-Reply-To: <1401283300-14176-4-git-send-email-arei.gonglei@huawei.com> References: <1401283300-14176-1-git-send-email-arei.gonglei@huawei.com> <1401283300-14176-4-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 3/6] json-parser: Fix two coverity defects List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: arei.gonglei@huawei.com Cc: kwolf@redhat.com, ChenLiang , peter.crosthwaite@xilinx.com, weidong.huang@huawei.com, aliguori@amazon.com, mst@redhat.com, luonengjun@huawei.com, qemu-devel@nongnu.org, armbru@redhat.com, qiaonuohan@cn.fujitsu.com, av1474@comtv.ru, kraxel@redhat.com, stefanha@redhat.com, crobinso@redhat.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de On Wed, 28 May 2014 21:21:37 +0800 wrote: > From: Gonglei > > Pointer "token" returned by "parser_context_pop_token(ctxt)" is never used. That's not true, "token" is used by token_is_operator(). The patch seems correct to me, but you have to fix the changelog. Also, who's going to take care of this series? I'm willing to cherry-pick this patch... > > Signed-off-by: ChenLiang > Signed-off-by: Gonglei > --- > qobject/json-parser.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/qobject/json-parser.c b/qobject/json-parser.c > index e46c264..4288267 100644 > --- a/qobject/json-parser.c > +++ b/qobject/json-parser.c > @@ -423,7 +423,6 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) > if (!token_is_operator(token, '{')) { > goto out; > } > - token = NULL; > > dict = qdict_new(); > > @@ -449,7 +448,6 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) > parse_error(ctxt, token, "expected separator in dict"); > goto out; > } > - token = NULL; > > if (parse_pair(ctxt, dict, ap) == -1) { > goto out; > @@ -461,10 +459,8 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) > goto out; > } > } > - token = NULL; > } else { > - token = parser_context_pop_token(ctxt); > - token = NULL; > + (void)parser_context_pop_token(ctxt); > } > > return QOBJECT(dict); > @@ -487,10 +483,8 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) > } > > if (!token_is_operator(token, '[')) { > - token = NULL; > goto out; > } > - token = NULL; > > list = qlist_new(); > > @@ -523,8 +517,6 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) > goto out; > } > > - token = NULL; > - > obj = parse_value(ctxt, ap); > if (obj == NULL) { > parse_error(ctxt, token, "expecting value"); > @@ -539,11 +531,8 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) > goto out; > } > } > - > - token = NULL; > } else { > - token = parser_context_pop_token(ctxt); > - token = NULL; > + (void)parser_context_pop_token(ctxt); > } > > return QOBJECT(list);