X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-generate-io-struct.c;h=4515b53e437fb16238530f9371b20a745b79f2b2;hb=fbad6b84b7a1a9e1d046d9ef983ca001f4f7ba29;hp=664d0af13f2c60faec9e63621c32e6e07cb7037c;hpb=cca460600a28b04ef12f4c91184f031abfa6b1a4;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 664d0af1..4515b53e 100644
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -1319,6 +1319,11 @@ struct bt_declaration *ctf_declaration_integer_visit(FILE *fd, int depth,
 				return NULL;
 			}
 			size = right->u.unary_expression.u.unsigned_constant;
+			if (!size) {
+				fprintf(fd, "[error] %s: integer size: expecting non-zero constant\n",
+					__func__);
+				return NULL;
+			}
 			has_size = 1;
 		} else if (!strcmp(left->u.unary_expression.u.string, "align")) {
 			if (right->u.unary_expression.type != UNARY_UNSIGNED_CONSTANT) {
@@ -2399,6 +2404,7 @@ int ctf_clock_declaration_visit(FILE *fd, int depth, struct ctf_node *node,
 				goto error;
 			}
 			clock->absolute = ret;
+			ret = 0;
 		} else {
 			fprintf(fd, "[warning] %s: attribute \"%s\" is unknown in clock declaration.\n", __func__, left);
 		}