projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: string packet boundary handling, bits vs bytes
[babeltrace.git]
/
formats
/
ctf
/
types
/
string.c
diff --git
a/formats/ctf/types/string.c
b/formats/ctf/types/string.c
index 5771733b63ba35c42ddb3da3e06a22c5c2baa7f7..002f1b4fb335f5bb34d776fa79d36b5f9bf83c35 100644
(file)
--- a/
formats/ctf/types/string.c
+++ b/
formats/ctf/types/string.c
@@
-31,7
+31,7
@@
#include <limits.h> /* C99 limits */
#include <string.h>
#include <limits.h> /* C99 limits */
#include <string.h>
-int ctf_string_read(struct bt_stream_pos *ppos, struct definition *definition)
+int ctf_string_read(struct bt_stream_pos *ppos, struct
bt_
definition *definition)
{
struct definition_string *string_definition =
container_of(definition, struct definition_string, p);
{
struct definition_string *string_definition =
container_of(definition, struct definition_string, p);
@@
-39,19
+39,21
@@
int ctf_string_read(struct bt_stream_pos *ppos, struct definition *definition)
string_definition->declaration;
struct ctf_stream_pos *pos = ctf_pos(ppos);
size_t len;
string_definition->declaration;
struct ctf_stream_pos *pos = ctf_pos(ppos);
size_t len;
- ssize_t max_len;
+ ssize_t max_len
_bits
;
char *srcaddr;
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)
return -EFAULT;
srcaddr = ctf_get_pos_addr(pos);
if (pos->offset == EOF)
return -EFAULT;
- /* Not counting \0 */
- max_len
= pos->packet_size - pos->offset - 1
;
- if (max_len < 0)
+ /* Not counting \0
. Counting in bits.
*/
+ max_len
_bits = pos->packet_size - pos->offset - CHAR_BIT
;
+ if (max_len
_bits
< 0)
return -EFAULT;
return -EFAULT;
- len = strnlen(srcaddr, max_len) + 1; /* Add \0 */
+ /* Add \0, counting in bytes. */
+ len = strnlen(srcaddr, (size_t) max_len_bits / CHAR_BIT) + 1;
/* Truncated string, unexpected. Trace probably corrupted. */
if (srcaddr[len - 1] != '\0')
return -EFAULT;
/* Truncated string, unexpected. Trace probably corrupted. */
if (srcaddr[len - 1] != '\0')
return -EFAULT;
@@
-64,12
+66,13
@@
int ctf_string_read(struct bt_stream_pos *ppos, struct 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;
}
int ctf_string_write(struct bt_stream_pos *ppos,
return 0;
}
int ctf_string_write(struct bt_stream_pos *ppos,
- struct definition *definition)
+ struct
bt_
definition *definition)
{
struct definition_string *string_definition =
container_of(definition, struct definition_string, p);
{
struct definition_string *string_definition =
container_of(definition, struct definition_string, p);
@@
-79,7
+82,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
+95,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.023554 seconds
and
4
git commands to generate.