projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: add stricter checks on packet boundaries
[babeltrace.git]
/
formats
/
ctf
/
types
/
string.c
diff --git
a/formats/ctf/types/string.c
b/formats/ctf/types/string.c
index a2433bf5922d2013e80f19a1e1897842657de535..3dd1414a0e078882160c7de6d28226d7a27b0973 100644
(file)
--- a/
formats/ctf/types/string.c
+++ b/
formats/ctf/types/string.c
@@
-42,7
+42,8
@@
int ctf_string_read(struct bt_stream_pos *ppos, struct bt_definition *definition
ssize_t max_len;
char *srcaddr;
ssize_t max_len;
char *srcaddr;
- ctf_align_pos(pos, string_declaration->p.alignment);
+ if (!ctf_align_pos(pos, string_declaration->p.alignment))
+ return -EFAULT;
srcaddr = ctf_get_pos_addr(pos);
if (pos->offset == EOF)
srcaddr = ctf_get_pos_addr(pos);
if (pos->offset == EOF)
@@
-64,7
+65,8
@@
int ctf_string_read(struct bt_stream_pos *ppos, struct bt_definition *definition
printf_debug("CTF string read %s\n", srcaddr);
memcpy(string_definition->value, srcaddr, len);
string_definition->len = len;
printf_debug("CTF string read %s\n", srcaddr);
memcpy(string_definition->value, srcaddr, len);
string_definition->len = len;
- ctf_move_pos(pos, len * CHAR_BIT);
+ if (!ctf_move_pos(pos, len * CHAR_BIT))
+ return -EFAULT;
return 0;
}
return 0;
}
@@
-79,7
+81,8
@@
int ctf_string_write(struct bt_stream_pos *ppos,
size_t len;
char *destaddr;
size_t len;
char *destaddr;
- ctf_align_pos(pos, string_declaration->p.alignment);
+ if (!ctf_align_pos(pos, string_declaration->p.alignment))
+ return -EFAULT;
assert(string_definition->value != NULL);
len = string_definition->len;
assert(string_definition->value != NULL);
len = string_definition->len;
@@
-91,6
+94,7
@@
int ctf_string_write(struct bt_stream_pos *ppos,
destaddr = ctf_get_pos_addr(pos);
memcpy(destaddr, string_definition->value, len);
end:
destaddr = ctf_get_pos_addr(pos);
memcpy(destaddr, string_definition->value, len);
end:
- ctf_move_pos(pos, len * CHAR_BIT);
+ if (!ctf_move_pos(pos, len * CHAR_BIT))
+ return -EFAULT;
return 0;
}
return 0;
}
This page took
0.02363 seconds
and
4
git commands to generate.