diff options
| author | Greg Thelen <gthelen@google.com> | 2019-06-27 08:25:02 -0700 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-05 11:27:13 -0400 |
| commit | 10e4d9f87e372df2f1be20f44eb806d8d25cc6ab (patch) | |
| tree | 6526659d3a8c7afa0dbe5be549c887715994f805 | |
| parent | 52906c6a5b5419071f1a8ffda51f3b5ae85fe473 (diff) | |
| download | trace-cmd-10e4d9f87e372df2f1be20f44eb806d8d25cc6ab.tar.gz | |
trace-cmd: Always initialize write_record() len
write_record() uses an uninitializedd 'len' when record->size is 0. I'm
not sure how likely this case is.
To be safe and silence compiler warning, unconditionally initialize len.
Link: http://lore.kernel.org/linux-trace-devel/20190627152502.174918-1-gthelen@google.com
Fixes: 87d2a344a ("trace-cmd: Add split feature")
Signed-off-by: Greg Thelen <gthelen@google.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | tracecmd/trace-split.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c index d27b3c65..6c8a774e 100644 --- a/tracecmd/trace-split.c +++ b/tracecmd/trace-split.c @@ -80,7 +80,7 @@ static int write_record(struct tracecmd_input *handle, unsigned long long diff; struct tep_handle *pevent; void *page; - int len; + int len = 0; char *ptr; int index = 0; int time; @@ -106,12 +106,8 @@ static int write_record(struct tracecmd_input *handle, return 0; } - if (record->size) { - if (record->size < 28 * 4) - len = record->size / 4; - else - len = 0; - } + if (record->size && (record->size < 28 * 4)) + len = record->size / 4; time = (unsigned)diff; time = create_type_len(pevent, time, len); |