[PATCH] trace-cmd: always initialize write_record() len

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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.

Signed-off-by: Greg Thelen <gthelen@xxxxxxxxxx>
---
 tracecmd/trace-split.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tracecmd/trace-split.c b/tracecmd/trace-split.c
index d27b3c65badc..6c8a774e13d0 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);
-- 
2.22.0.410.gd8fdbe21b5-goog




[Index of Archives]     [Linux USB Development]     [Linux USB Development]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux