From: Nathan Scott <nathans@sgi.com>
Date: Fri, 2 Sep 2005 08:56:20 +0000 (+0200)
Subject: [PATCH] Fix usage of uninitialized array in pdu extraction
X-Git-Tag: blktrace-0.99~217
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9cc38a45c6dc4913c897b145be03d68211aeed15;p=blktrace.git

[PATCH] Fix usage of uninitialized array in pdu extraction
---

diff --git a/blktrace.c b/blktrace.c
index a481e80..d3f2363 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -118,14 +118,16 @@ static int trace_started;
 
 inline int compare_mask_map(struct mask_map *mmp, char *string)
 {
-        int i;
-        char *s, *ustring = strdup(string);
+	int i, result;
+	char *s, *ustring = strdup(string);
 
-        for (i = 0, s = ustring; i < strlen(ustring); i++, s++)
-                *s = toupper(*s);
+	for (i = 0, s = ustring; i < strlen(ustring); i++, s++)
+		*s = toupper(*s);
 
-        return !strcmp(mmp->short_form, ustring) ||
-               !strcmp(mmp->long_form, ustring);
+	result = !strcmp(mmp->short_form, ustring) ||
+                 !strcmp(mmp->long_form, ustring);
+	free(ustring);
+	return result;
 }
 
 int find_mask_map(char *string)
@@ -212,7 +214,7 @@ static void *extract(void *arg)
 {
 	struct thread_information *tip = arg;
 	int tracefd, ret, ofd, pdu_len;
-	char ip[64], op[64], dp[64];
+	char ip[64], op[64];
 	struct blk_io_trace t;
 	pid_t pid = getpid();
 	cpu_set_t cpu_mask;
@@ -275,7 +277,7 @@ static void *extract(void *arg)
 		}
 
 		if (pdu_len)
-			extract_data(tip->cpu, ip, tracefd, dp, ofd, pdu_len);
+			extract_data(tip->cpu, ip, tracefd, op, ofd, pdu_len);
 
 		tip->events_processed++;
 	}
@@ -445,7 +447,6 @@ int main(int argc, char *argv[])
 
 	stop_threads();
 	stop_trace();
-	close(devfd);
 	show_stats();
 
 	return 0;