From e2ccd1a087addd231f841629b9f32e4c6ba7d87c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 28 Oct 2014 12:33:15 -0400 Subject: [PATCH] Fix: respect signed integers' length when printing in hex base MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Make sure we don't print a full 64-bit sign-extended value when printing a negative integer in hexadecimal base. Fixes #848 Signed-off-by: Jérémie Galarneau --- formats/ctf-text/types/integer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c index 34df4fc9..cc3a3551 100644 --- a/formats/ctf-text/types/integer.c +++ b/formats/ctf-text/types/integer.c @@ -113,10 +113,15 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def { uint64_t v; - if (!integer_declaration->signedness) + if (!integer_declaration->signedness) { v = integer_definition->value._unsigned; - else + } else { + /* Round length to the nearest nibble */ + uint8_t rounded_len = ((integer_declaration->len + 3) & ~0x3); + v = (uint64_t) integer_definition->value._signed; + v &= ((uint64_t) 1 << rounded_len) - 1; + } fprintf(pos->fp, "0x%" PRIX64, v); break; -- 2.34.1