X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Ftypes%2Finteger.c;fp=formats%2Fctf-text%2Ftypes%2Finteger.c;h=ae08a5c1df0638614bfab40308175b2094e32bbf;hp=9602a902a766d8673a14e8896ee91bc59e3d34e7;hb=fab5d962652945da0ef70c20d1610fd6fb14a895;hpb=84db7bda6d4283c52cd82b737130b54c86a3610c

diff --git a/formats/ctf-text/types/integer.c b/formats/ctf-text/types/integer.c
index 9602a902..ae08a5c1 100644
--- a/formats/ctf-text/types/integer.c
+++ b/formats/ctf-text/types/integer.c
@@ -100,10 +100,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;
@@ -115,11 +124,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);