From d4dfa9788e897bd7c72014583b6caf337d5404a4 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 6 May 2016 16:08:57 -0400 Subject: [PATCH] Fix: ctf-text: signed base 8, 16 printout MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Base 16 signed integer printout is buggy for 64-bit length: a shift of 64-bit is undefined. Change printout of base 8 signed integer to match what is done for base 16. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- formats/ctf-text/types/integer.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c index cc3a3551..f4d39256 100644 --- a/formats/ctf-text/types/integer.c +++ b/formats/ctf-text/types/integer.c @@ -101,10 +101,19 @@ 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 { v = (uint64_t) integer_definition->value._signed; + if (integer_declaration->len < 64) { + /* Round length to the nearest 3-bit */ + uint8_t rounded_len = + integer_declaration->len + + ((integer_declaration->len + 2) % 3); + + v &= ((uint64_t) 1 << rounded_len) - 1; + } + } fprintf(pos->fp, "0%" PRIo64, v); break; @@ -116,11 +125,14 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def if (!integer_declaration->signedness) { v = integer_definition->value._unsigned; } 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; + if (integer_declaration->len < 64) { + /* Round length to the nearest nibble */ + uint8_t rounded_len = + ((integer_declaration->len + 3) & ~0x3); + + v &= ((uint64_t) 1 << rounded_len) - 1; + } } fprintf(pos->fp, "0x%" PRIX64, v); -- 2.34.1