From d8b8364c8acea078ff098d8b6fbaa0a29da9346a Mon Sep 17 00:00:00 2001
From: Lev Walkin <vlm@lionet.info>
Date: Mon, 14 Mar 2016 02:00:27 -0700
Subject: removed unneeded check before free()

---
 libasn1parser/asn1p_expr.c   | 3 +--
 libasn1parser/asn1p_module.c | 3 +--
 libasn1parser/asn1p_oid.c    | 4 +---
 libasn1parser/asn1p_param.c  | 3 +--
 libasn1parser/asn1p_ref.c    | 1 -
 libasn1parser/asn1p_xports.c | 3 +--
 6 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'libasn1parser')

diff --git a/libasn1parser/asn1p_expr.c b/libasn1parser/asn1p_expr.c
index 71c1636d..b7a03ecb 100644
--- a/libasn1parser/asn1p_expr.c
+++ b/libasn1parser/asn1p_expr.c
@@ -245,8 +245,7 @@ asn1p_expr_free(asn1p_expr_t *expr) {
 			asn1p_expr_free(tm);
 		}
 
-		if(expr->Identifier)
-			free(expr->Identifier);
+		free(expr->Identifier);
 		if(expr->reference)
 			asn1p_ref_free(expr->reference);
 		if(expr->constraints)
diff --git a/libasn1parser/asn1p_module.c b/libasn1parser/asn1p_module.c
index d030da78..29cf683a 100644
--- a/libasn1parser/asn1p_module.c
+++ b/libasn1parser/asn1p_module.c
@@ -27,8 +27,7 @@ asn1p_module_free(asn1p_module_t *mod) {
 	if(mod) {
 		asn1p_expr_t *expr;
 
-		if(mod->ModuleName)
-			free(mod->ModuleName);
+		free(mod->ModuleName);
 
 		if(mod->module_oid)
 			asn1p_oid_free(mod->module_oid);
diff --git a/libasn1parser/asn1p_oid.c b/libasn1parser/asn1p_oid.c
index 7d1c1a50..80d41e2d 100644
--- a/libasn1parser/asn1p_oid.c
+++ b/libasn1parser/asn1p_oid.c
@@ -50,7 +50,6 @@ asn1p_oid_free(asn1p_oid_t *oid) {
 	if(oid) {
 		if(oid->arcs) {
 			while(oid->arcs_count--) {
-				if(oid->arcs[oid->arcs_count].name)
 				free(oid->arcs[oid->arcs_count].name);
 			}
 		}
@@ -75,8 +74,7 @@ asn1p_oid_arc_new(const char *optName, asn1c_integer_t optNumber /* = -1 */) {
 void
 asn1p_oid_arc_free(asn1p_oid_arc_t *arc) {
 	if(arc) {
-		if(arc->name)
-			free(arc->name);
+		free(arc->name);
 		free(arc);
 	}
 }
diff --git a/libasn1parser/asn1p_param.c b/libasn1parser/asn1p_param.c
index a48faed2..6fd7f216 100644
--- a/libasn1parser/asn1p_param.c
+++ b/libasn1parser/asn1p_param.c
@@ -29,8 +29,7 @@ asn1p_paramlist_free(asn1p_paramlist_t *pl) {
 			while(i--) {
 				if(pl->params[i].governor)
 					asn1p_ref_free(pl->params[i].governor);
-				if(pl->params[i].argument)
-					free(pl->params[i].argument);
+				free(pl->params[i].argument);
 				pl->params[i].governor = 0;
 				pl->params[i].argument = 0;
 			}
diff --git a/libasn1parser/asn1p_ref.c b/libasn1parser/asn1p_ref.c
index af6f6bb2..79e32aaf 100644
--- a/libasn1parser/asn1p_ref.c
+++ b/libasn1parser/asn1p_ref.c
@@ -27,7 +27,6 @@ asn1p_ref_free(asn1p_ref_t *ref) {
 		if(ref->components) {
 			int i = ref->comp_count;
 			while(i--) {
-				if(ref->components[i].name)
 				free(ref->components[i].name);
 				ref->components[i].name = 0;
 			}
diff --git a/libasn1parser/asn1p_xports.c b/libasn1parser/asn1p_xports.c
index abe12329..594a60e4 100644
--- a/libasn1parser/asn1p_xports.c
+++ b/libasn1parser/asn1p_xports.c
@@ -25,8 +25,7 @@ asn1p_xports_new() {
 void
 asn1p_xports_free(asn1p_xports_t *xp) {
 	if(xp) {
-		if(xp->fromModuleName)
-			free(xp->fromModuleName);
+		free(xp->fromModuleName);
 		if(xp->identifier.oid)
 			asn1p_oid_free(xp->identifier.oid);
 		free(xp);
-- 
cgit v1.2.3