From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 28 Oct 2014 16:33:15 +0000 (-0400)
Subject: Fix: respect signed integers' length when printing in hex base
X-Git-Tag: v1.4.0-rc1~7
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=e2ccd1a087addd231f841629b9f32e4c6ba7d87c

Fix: respect signed integers' length when printing in hex base

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 <jeremie.galarneau@efficios.com>
---

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;