X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Ffloat.c;h=afe5e8d2cf2ef9d66a1cce2df2727bea70a4ba34;hp=2daadf91e40de1325832d39e867ab6ff38e826f0;hb=70fd5a515016525961d4bef0d627616abdc9bc28;hpb=ca334c7230d120ffe211efbfd6efe467b5d4d794 diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c index 2daadf91..afe5e8d2 100644 --- a/formats/ctf/types/float.c +++ b/formats/ctf/types/float.c @@ -201,7 +201,10 @@ int ctf_float_read(struct bt_stream_pos *ppos, struct bt_definition *definition) mmap_align_set_addr(&mma, (char *) u.bits); destp.base_mma = &mma; destp.packet_size = sizeof(u) * CHAR_BIT; - ctf_align_pos(pos, float_declaration->p.alignment); + if (!ctf_align_pos(pos, float_declaration->p.alignment)) { + ret = -EFAULT; + goto end_unref; + } ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition); switch (float_declaration->mantissa->len + 1) { case FLT_MANT_DIG: @@ -232,7 +235,7 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition union doubleIEEE754 u; struct bt_definition *tmpdef; struct definition_float *tmpfloat; - struct ctf_stream_pos srcp; + struct ctf_stream_pos srcp = { { 0 } }; struct mmap_align mma; int ret; @@ -268,7 +271,10 @@ int ctf_float_write(struct bt_stream_pos *ppos, struct bt_definition *definition ret = -EINVAL; goto end_unref; } - ctf_align_pos(pos, float_declaration->p.alignment); + if (!ctf_align_pos(pos, float_declaration->p.alignment)) { + ret = -EFAULT; + goto end_unref; + } ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat); end_unref: