projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into bindings/python
[babeltrace.git]
/
formats
/
ctf
/
writer
/
event-fields.c
diff --git
a/formats/ctf/writer/event-fields.c
b/formats/ctf/writer/event-fields.c
index 30fe5783db6e86a696b9ef96321ef9f233a7767b..c4d1b968587e33f00f24f8efe0c0658c201e6ba6 100644
(file)
--- a/
formats/ctf/writer/event-fields.c
+++ b/
formats/ctf/writer/event-fields.c
@@
-179,8
+179,8
@@
struct bt_ctf_field *bt_ctf_field_create(struct bt_ctf_field_type *type)
}
type_id = bt_ctf_field_type_get_type_id(type);
}
type_id = bt_ctf_field_type_get_type_id(type);
- if (type_id <= CTF_TYPE_UNKNOWN ||
-
type_id >= NR_CTF_TYPES
) {
+ if (type_id <= CTF_TYPE_UNKNOWN ||
type_id >= NR_CTF_TYPES ||
+
bt_ctf_field_type_validate(type)
) {
goto error;
}
goto error;
}
@@
-941,7
+941,7
@@
void bt_ctf_field_string_destroy(struct bt_ctf_field *field)
static
int bt_ctf_field_generic_validate(struct bt_ctf_field *field)
{
static
int bt_ctf_field_generic_validate(struct bt_ctf_field *field)
{
- return
!(field && field->payload_set)
;
+ return
(field && field->payload_set) ? 0 : -1
;
}
static
}
static
@@
-1125,10
+1125,16
@@
int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
while (!ctf_pos_access_ok(pos,
offset_align(pos->offset,
field->type->declaration->alignment))) {
while (!ctf_pos_access_ok(pos,
offset_align(pos->offset,
field->type->declaration->alignment))) {
- increase_packet_size(pos);
+ ret = increase_packet_size(pos);
+ if (ret) {
+ goto end;
+ }
}
}
- ctf_align_pos(pos, field->type->declaration->alignment);
+ if (!ctf_align_pos(pos, field->type->declaration->alignment)) {
+ ret = -1;
+ goto end;
+ }
for (i = 0; i < structure->fields->len; i++) {
struct bt_ctf_field *field = g_ptr_array_index(
for (i = 0; i < structure->fields->len; i++) {
struct bt_ctf_field *field = g_ptr_array_index(
@@
-1139,7
+1145,7
@@
int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
break;
}
}
break;
}
}
-
+end:
return ret;
}
return ret;
}
This page took
0.025421 seconds
and
4
git commands to generate.