projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UST strncpy assert fix
[ust.git]
/
libust
/
buffers.h
diff --git
a/libust/buffers.h
b/libust/buffers.h
index 63449d6c024194fca1341769083a55cdfb93ff4b..9fedc487f1847c65a707981016023c7c4ee9e655 100644
(file)
--- a/
libust/buffers.h
+++ b/
libust/buffers.h
@@
-522,7
+522,8
@@
static __inline__ int ust_buffers_write(struct ust_buffer *buf, size_t offset,
size_t buf_offset = BUFFER_OFFSET(offset, buf->chan);
assert(buf_offset < buf->chan->subbuf_size*buf->chan->subbuf_cnt);
size_t buf_offset = BUFFER_OFFSET(offset, buf->chan);
assert(buf_offset < buf->chan->subbuf_size*buf->chan->subbuf_cnt);
- assert(buf_offset + len < buf->chan->subbuf_size*buf->chan->subbuf_cnt);
+ assert(buf_offset + len
+ <= buf->chan->subbuf_size*buf->chan->subbuf_cnt);
ust_buffers_do_copy(buf->buf_data + buf_offset, src, len);
ust_buffers_do_copy(buf->buf_data + buf_offset, src, len);
@@
-590,7
+591,8
@@
int ust_buffers_strncpy(struct ust_buffer *buf, size_t offset, const void *src,
int terminated;
assert(buf_offset < buf->chan->subbuf_size*buf->chan->subbuf_cnt);
int terminated;
assert(buf_offset < buf->chan->subbuf_size*buf->chan->subbuf_cnt);
- assert(buf_offset + len < buf->chan->subbuf_size*buf->chan->subbuf_cnt);
+ assert(buf_offset + len
+ <= buf->chan->subbuf_size*buf->chan->subbuf_cnt);
copied = ust_buffers_do_strncpy(buf->buf_data + buf_offset,
src, len, &terminated);
copied = ust_buffers_do_strncpy(buf->buf_data + buf_offset,
src, len, &terminated);
This page took
0.023195 seconds
and
4
git commands to generate.