From patchwork Wed Mar 9 05:56:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 594835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B155D1402C9 for ; Wed, 9 Mar 2016 16:57:40 +1100 (AEDT) Received: from localhost ([::1]:39258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adX7q-0003rE-SQ for incoming@patchwork.ozlabs.org; Wed, 09 Mar 2016 00:57:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adX7Q-0002zV-0K for qemu-devel@nongnu.org; Wed, 09 Mar 2016 00:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adX7P-0002Qi-4J for qemu-devel@nongnu.org; Wed, 09 Mar 2016 00:57:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adX7K-0002Pq-UI; Wed, 09 Mar 2016 00:57:07 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 80C97C00F1CF; Wed, 9 Mar 2016 05:57:06 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-14-238.nay.redhat.com [10.66.14.238]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u295ujeW011702; Wed, 9 Mar 2016 00:57:00 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 9 Mar 2016 13:56:37 +0800 Message-Id: <1457502997-30904-3-git-send-email-peterx@redhat.com> In-Reply-To: <1457502997-30904-1-git-send-email-peterx@redhat.com> References: <1457502997-30904-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-block@nongnu.org, armbru@redhat.com, peterx@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 2/2] block/qapi: fix unbounded stack for dump_qdict X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Using heap instead of stack for better safety. Signed-off-by: Peter Xu Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- block/qapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index c4c2115..b798e35 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -636,9 +636,8 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation, for (entry = qdict_first(dict); entry; entry = qdict_next(dict, entry)) { QType type = qobject_type(entry->value); bool composite = (type == QTYPE_QDICT || type == QTYPE_QLIST); - char key[strlen(entry->key) + 1]; + char *key = g_malloc(strlen(entry->key) + 1); int i; - /* replace dashes with spaces in key (variable) names */ for (i = 0; entry->key[i]; i++) { key[i] = entry->key[i] == '-' ? ' ' : entry->key[i]; @@ -650,6 +649,7 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation, if (!composite) { func_fprintf(f, "\n"); } + g_free(key); } }