From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4yU6-0001FH-60 for qemu-devel@nongnu.org; Wed, 09 Jul 2014 16:29:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4yU1-0007C5-1L for qemu-devel@nongnu.org; Wed, 09 Jul 2014 16:28:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60620 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4yU0-0007C1-R9 for qemu-devel@nongnu.org; Wed, 09 Jul 2014 16:28:52 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 9 Jul 2014 22:28:49 +0200 Message-Id: <1404937729-19780-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH buildfix for-2.1] 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: Peter Maydell , "Michael S. Tsirkin" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Hu Tao 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 --- 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.4.5