Fix: ctf-text: signed base 8, 16 printout
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 6 May 2016 20:08:57 +0000 (16:08 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 6 May 2016 21:24:57 +0000 (17:24 -0400)
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 <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
formats/ctf-text/types/integer.c

index cc3a3551b2bc31074c4fd532c6414b456868db44..f4d392563b1db522bf580f53ea4f27949339f6bf 100644 (file)
@@ -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);
This page took 0.045234 seconds and 4 git commands to generate.