From 0eb28a22a58435fe5bdea66e1a93f52275340c43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Mon, 30 May 2016 14:39:27 -0400 Subject: [PATCH] Fix: undefined bit shift operation when printing octal numbers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported by Coverity as: CID 1355338 (#1 of 1): Bad bit shift operation (BAD_SHIFT) Signed-off-by: Jérémie Galarneau --- formats/ctf-text/types/integer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c index ca0e5e60..c08aa4bc 100644 --- a/formats/ctf-text/types/integer.c +++ b/formats/ctf-text/types/integer.c @@ -106,11 +106,12 @@ int ctf_text_integer_write(struct bt_stream_pos *ppos, struct bt_definition *def } 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); + size_t len = integer_declaration->len; + size_t rounded_len; + assert(len != 0); + /* Round length to the nearest 3-bit */ + rounded_len = (((len - 1) / 3) + 1) * 3; v &= ((uint64_t) 1 << rounded_len) - 1; } } -- 2.34.1