Revert "Deletion of unnecessary checks before specific function calls"

Accidentally committed two patches under the same commit message.  Both
patches will be added immediately after.

This reverts commit fb6f65a01eca950e2e12a87492268e7d2105aa0b.

5 files changed, 20 insertions, 10 deletions

diff --git a/src/cpu/abstract_cpu.cpp b/src/cpu/abstract_cpu.cpp
index a3a9ffa..3b841bf 100644
--- a/src/cpu/abstract_cpu.cpp
+++ b/src/cpu/abstract_cpu.cpp
@@ -34,12 +34,14 @@ abstract_cpu::~abstract_cpu()
 {
 	unsigned int i=0;
 	for (i=0; i < cstates.size(); i++){
-		delete cstates[i];
+		if(cstates[i])
+			delete cstates[i];
 	}
 	cstates.clear();
 
 	for (i=0; i < pstates.size(); i++){
-		delete pstates[i];
+		if(pstates[i])
+			delete pstates[i];
 	}
 	pstates.clear();
 }
diff --git a/src/devlist.cpp b/src/devlist.cpp
index 7f599ac..20fe5da 100644
--- a/src/devlist.cpp
+++ b/src/devlist.cpp
@@ -77,15 +77,18 @@ void clean_open_devices()
 	unsigned int i=0;
 
 	for (i = 0; i < one.size(); i++) {
-		free(one[i]);
+		if(one[i])
+			free(one[i]);
 	}
 
 	for (i = 0; i < two.size(); i++) {
-		free(two[i]);
+		if(two[i])
+			free(two[i]);
 	}
 
 	for (i = 0; i < devpower.size(); i++){
-		free(devpower[i]);
+		if(devpower[i])
+			free(devpower[i]);
 	}
 }
 
diff --git a/src/perf/perf.cpp b/src/perf/perf.cpp
index b1103a7..b176256 100644
--- a/src/perf/perf.cpp
+++ b/src/perf/perf.cpp
@@ -149,7 +149,8 @@ void perf_event::create_perf_event(char *eventname, int _cpu)
 
 void perf_event::set_event_name(const char *event_name)
 {
-	free(name);
+	if (name)
+		free(name);
 	name = strdup(event_name);
 	if (!name) {
 		fprintf(stderr, "failed to allocate event name\n");
@@ -167,7 +168,8 @@ void perf_event::set_event_name(const char *event_name)
 
 perf_event::~perf_event(void)
 {
-	free(name);
+	if (name)
+		free(name);
 
 	if (perf_event::pevent->ref_count == 1) {
 		pevent_free(perf_event::pevent);
diff --git a/src/report/report-maker.cpp b/src/report/report-maker.cpp
index 4049a54..f2fe522 100644
--- a/src/report/report-maker.cpp
+++ b/src/report/report-maker.cpp
@@ -47,7 +47,8 @@ report_maker::report_maker(report_type t)
 
 report_maker::~report_maker()
 {
-	delete formatter;
+	if (formatter)
+		delete formatter;
 }
 
 /* ************************************************************************ */
@@ -97,7 +98,8 @@ report_maker::set_type(report_type t)
 void
 report_maker::setup_report_formatter()
 {
-	delete formatter;
+	if (formatter)
+		delete formatter;
 
 	if (type == REPORT_HTML)
 		formatter = new report_formatter_html();
diff --git a/traceevent/event-parse.c b/traceevent/event-parse.c
index 5a717a0..6195f6f 100644
--- a/traceevent/event-parse.c
+++ b/traceevent/event-parse.c
@@ -1023,7 +1023,8 @@ static enum event_type force_token(const char *str, char **tok)
 
 static void free_token(char *tok)
 {
-	free(tok);
+	if (tok)
+		free(tok);
 }
 
 static enum event_type read_token(char **tok)