[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH buildfix for-2.1] tests: Fix unterminated string
From: |
Hu Tao |
Subject: |
Re: [Qemu-devel] [PATCH buildfix for-2.1] tests: Fix unterminated string output visitor enum human string |
Date: |
Thu, 10 Jul 2014 15:33:33 +0800 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Wed, Jul 09, 2014 at 10:28:49PM +0200, Andreas Färber wrote:
> 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:
> assertion failed (str == str_human): ("\"value1\"" ==
> "\"value1\"\001EEEEEEEEEEEEEE\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 <address@hidden>
> Cc: Michael S. Tsirkin <address@hidden>
> Suggested-by: Eric Blake <address@hidden>
> Fixes: b4900c0 tests: add human format test for string output visitor
> Signed-off-by: Andreas Färber <address@hidden>
> ---
> 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-output-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(TestOutputVisitorData
> *data,
>
> for (i = 0; i < ENUM_ONE_MAX; i++) {
> char *str_human;
> - int len;
>
> visit_type_EnumOne(data->ov, &i, "unused", &err);
> g_assert(!err);
>
> - len = strlen(EnumOne_lookup[i]) + 2;
> - str_human = g_malloc0(len);
> - str_human[0] = '"';
> - strncpy(str_human + 1, EnumOne_lookup[i], strlen(EnumOne_lookup[i]));
> - str_human[len - 1] = '"';
> + str_human = g_strdup_printf("\"%s\"", EnumOne_lookup[i]);
>
> str = string_output_get_string(data->sov);
> g_assert(str != NULL);
> --
> 1.8.4.5
Reviewed-by: Hu Tao <address@hidden>