From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6efY-0004QE-VJ for qemu-devel@nongnu.org; Mon, 14 Jul 2014 07:43:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X6efU-0005LF-4c for qemu-devel@nongnu.org; Mon, 14 Jul 2014 07:43:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X6efT-0005L1-SP for qemu-devel@nongnu.org; Mon, 14 Jul 2014 07:43:40 -0400 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 (8.14.4/8.14.4) with ESMTP id s6EBhdRq010097 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 Jul 2014 07:43:39 -0400 From: Kevin Wolf Date: Mon, 14 Jul 2014 13:43:06 +0200 Message-Id: <1405338192-18850-17-git-send-email-kwolf@redhat.com> In-Reply-To: <1405338192-18850-1-git-send-email-kwolf@redhat.com> References: <1405338192-18850-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 for-2.1 16/22] tests: Fix unterminated string output visitor enum human string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com From: Andreas F=C3=A4rber The buffer was being allocated of size string length plus two. Around the string two quotes were being added, but no terminating NUL. It was then compared using g_assert_cmpstr(), resulting in fairly random assertion failures: ERROR:tests/test-string-output-visitor.c:213:test_visitor_out_enum: asse= rtion failed (str =3D=3D str_human): ("\"value1\"" =3D=3D "\"value1\"\001= EEEEEEEEEEEEEE\0171") There is no g_assert_cmpnstr() counterpart, so use g_strdup_printf() for safely assembling the string in the first place. Cc: Hu Tao Cc: Michael S. Tsirkin Suggested-by: Eric Blake Fixes: b4900c0 tests: add human format test for string output visitor Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- tests/test-string-output-visitor.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/test-string-output-visitor.c b/tests/test-string-outpu= t-visitor.c index e89e43c..101fb27 100644 --- a/tests/test-string-output-visitor.c +++ b/tests/test-string-output-visitor.c @@ -196,16 +196,11 @@ static void test_visitor_out_enum(TestOutputVisitor= Data *data, =20 for (i =3D 0; i < ENUM_ONE_MAX; i++) { char *str_human; - int len; =20 visit_type_EnumOne(data->ov, &i, "unused", &err); g_assert(!err); =20 - len =3D strlen(EnumOne_lookup[i]) + 2; - str_human =3D g_malloc0(len); - str_human[0] =3D '"'; - strncpy(str_human + 1, EnumOne_lookup[i], strlen(EnumOne_lookup[= i])); - str_human[len - 1] =3D '"'; + str_human =3D g_strdup_printf("\"%s\"", EnumOne_lookup[i]); =20 str =3D string_output_get_string(data->sov); g_assert(str !=3D NULL); --=20 1.8.3.1