From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 30 May 2016 18:39:27 +0000 (-0400)
Subject: Fix: undefined bit shift operation when printing octal numbers
X-Git-Tag: v1.4.0~7
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=0eb28a22a58435fe5bdea66e1a93f52275340c43;hp=182e96a1ffde8437ec33c35143d073d57d8de52f

Fix: undefined bit shift operation when printing octal numbers

Reported by Coverity as:
CID 1355338 (#1 of 1): Bad bit shift operation (BAD_SHIFT)

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 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;
 			}
 		}