Remove superfluous null-checks before strdup/free

NULL checks were removed for following free functions:

- g_free "If mem is NULL it simply returns"
  https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-free

- g_slist_free(_full)? "NULL is considered to be the empty list"
  https://developer.gnome.org/glib/stable/glib-Singly-Linked-Lists.html

- g_strfreev "If str_array is NULL, this function simply returns."
  https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strfreev

- g_slice_free "If mem is NULL, this macro does nothing."
  https://developer.gnome.org/glib/stable/glib-Memory-Slices.html#g-slice-free

- g_match_info_free "not NULL... otherwise does nothing"
  https://developer.gnome.org/glib/stable/glib-Perl-compatible-regular-expressions.html#g-match-info-free

- dfilter_free defined in Wireshark code. Returns early when passed NULL
  epan/dfilter/dfilter.c

They were also removed around calls to g_strdup where applicable:

- g_strdup "If str is NULL it returns NULL."
  https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strdup

Change-Id: Ie80c2db89bef531edc3aed7b7c9f654e1d654d04
Reviewed-on: https://code.wireshark.org/review/23406
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

45 files changed, 131 insertions, 354 deletions

diff --git a/epan/color_filters.c b/epan/color_filters.c
index 3a184bb3a8..da0dd96512 100644
--- a/epan/color_filters.c
+++ b/epan/color_filters.c
@@ -173,10 +173,8 @@ color_filters_set_tmp(guint8 filt_nr, const gchar *filter, gboolean disabled, gc
                 g_free(local_err_msg);
                 return FALSE;
             } else {
-                if (colorf->filter_text != NULL)
-                    g_free(colorf->filter_text);
-                if (colorf->c_colorfilter != NULL)
-                    dfilter_free(colorf->c_colorfilter);
+                g_free(colorf->filter_text);
+                dfilter_free(colorf->c_colorfilter);
                 colorf->filter_text = g_strdup(tmpfilter);
                 colorf->c_colorfilter = compiled_filter;
                 colorf->disabled = ((i!=filt_nr) ? TRUE : disabled);
@@ -225,12 +223,9 @@ color_filters_reset_tmp(gchar **err_msg)
 void
 color_filter_delete(color_filter_t *colorf)
 {
-    if (colorf->filter_name != NULL)
-        g_free(colorf->filter_name);
-    if (colorf->filter_text != NULL)
-        g_free(colorf->filter_text);
-    if (colorf->c_colorfilter != NULL)
-        dfilter_free(colorf->c_colorfilter);
+    g_free(colorf->filter_name);
+    g_free(colorf->filter_text);
+    dfilter_free(colorf->c_colorfilter);
     g_free(colorf);
 }
 
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c
index 2b8c291235..577b1a3bd4 100644
--- a/epan/crypt/airpdcap.c
+++ b/epan/crypt/airpdcap.c
@@ -2088,8 +2088,7 @@ parse_key_string(gchar* input_string, guint8 key_type)
             g_byte_array_free(ssid_ba, TRUE);
 
         g_free(key);
-        if(ssid != NULL)
-            g_free(ssid);
+        g_free(ssid);
 
         /* Free the array of strings */
         g_strfreev(tokens);
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c
index 51babd2647..dbfbcc1c9d 100644
--- a/epan/dfilter/dfilter-macro.c
+++ b/epan/dfilter/dfilter-macro.c
@@ -184,7 +184,7 @@ static gchar* dfilter_macro_apply_recurse(const gchar* text, guint depth, gchar*
 		FGS(name); \
 		FGS(arg); \
 		if (args) { \
-			while(args->len) { void* p = g_ptr_array_remove_index_fast(args,0); if (p) g_free(p); } \
+			while(args->len) { void* p = g_ptr_array_remove_index_fast(args,0); g_free(p); } \
 			g_ptr_array_free(args,TRUE); \
 			args = NULL; \
 		} \
diff --git a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
index 6ce598896f..4412fb1440 100644
--- a/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
+++ b/epan/dissectors/asn1/kerberos/packet-kerberos-template.c
@@ -251,10 +251,7 @@ read_keytab_file_from_preferences(void)
 		return;
 	}
 
-	if (last_keytab != NULL) {
-		g_free(last_keytab);
-		last_keytab = NULL;
-	}
+	g_free(last_keytab);
 	last_keytab = g_strdup(keytab_filename);
 
 	read_keytab_file(last_keytab);
@@ -620,9 +617,9 @@ clear_keytab(void) {
 	for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
 		sk = (service_key_t *) ske->data;
 		if (sk) {
-					g_free(sk->contents);
-					g_free(sk);
-				}
+			g_free(sk->contents);
+			g_free(sk);
+		}
 	}
 	g_slist_free(service_key_list);
 	service_key_list = NULL;
diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c
index 544cf07fa5..10832a8a71 100644
--- a/epan/dissectors/asn1/ldap/packet-ldap-template.c
+++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c
@@ -515,8 +515,8 @@ attribute_types_free_cb(void*r)
 {
   attribute_type_t* rec = (attribute_type_t*)r;
 
-  if (rec->attribute_type) g_free(rec->attribute_type);
-  if (rec->attribute_desc) g_free(rec->attribute_desc);
+  g_free(rec->attribute_type);
+  g_free(rec->attribute_desc);
 }
 
 UAT_CSTRING_CB_DEF(attribute_types, attribute_type, attribute_type_t)
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 6d8b6dbc11..2e1baa8a71 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -513,13 +513,8 @@ void
 ber_decode_as(const gchar *syntax)
 {
 
-    if (decode_as_syntax) {
-        g_free(decode_as_syntax);
-        decode_as_syntax = NULL;
-    }
-
-    if (syntax)
-        decode_as_syntax = g_strdup(syntax);
+    g_free(decode_as_syntax);
+    decode_as_syntax = g_strdup(syntax);
 }
 
 /* Get oid syntax from hash table to get translation in proto dissection(packet-per.c) */
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 133511b8a8..94240b2e57 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -1487,11 +1487,7 @@ static void* uat_bootp_record_copy_cb(void* n, const void* o, size_t siz _U_) {
 	uat_bootp_record_t* new_record = (uat_bootp_record_t *)n;
 	const uat_bootp_record_t* old_record = (const uat_bootp_record_t *)o;
 
-	if (old_record->text) {
-		new_record->text = g_strdup(old_record->text);
-	} else {
-		new_record->text = NULL;
-	}
+	new_record->text = g_strdup(old_record->text);
 
 	return new_record;
 }
@@ -1509,7 +1505,7 @@ static gboolean uat_bootp_record_update_cb(void* r, char** err) {
 static void uat_bootp_record_free_cb(void*r) {
 	uat_bootp_record_t* rec = (uat_bootp_record_t *)r;
 
-	if (rec->text) g_free(rec->text);
+	g_free(rec->text);
 }
 
 UAT_DEC_CB_DEF(uat_bootp_records, opt, uat_bootp_record_t)
diff --git a/epan/dissectors/packet-corosync-totemnet.c b/epan/dissectors/packet-corosync-totemnet.c
index a0e5df2460..640b4144f0 100644
--- a/epan/dissectors/packet-corosync-totemnet.c
+++ b/epan/dissectors/packet-corosync-totemnet.c
@@ -481,10 +481,7 @@ proto_reg_handoff_corosync_totemnet(void)
     initialized = TRUE;
   }
 
-  if (corosync_totemnet_private_keys_list) {
-    g_strfreev(corosync_totemnet_private_keys_list);
-    corosync_totemnet_private_keys_list = NULL;
-  }
+  g_strfreev(corosync_totemnet_private_keys_list);
   corosync_totemnet_private_keys_list = g_strsplit(corosync_totemnet_private_keys, ";", 0);
 }
 
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 4d715dae99..d958bbcc9e 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -1128,8 +1128,7 @@ dcerpc_fragment_free_temporary_key(gpointer ptr)
 {
     dcerpc_fragment_key *key = (dcerpc_fragment_key *)ptr;
 
-    if (key)
-        g_slice_free(dcerpc_fragment_key, key);
+    g_slice_free(dcerpc_fragment_key, key);
 }
 
 static void
@@ -3118,9 +3117,7 @@ dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, dcerpc_
     } while (found_new_pointer);
     DISSECTOR_ASSERT(original_depth == current_depth);
 
-    if (ndr_pointer_list) {
-        g_slist_free_full(ndr_pointer_list, g_free);
-    }
+    g_slist_free_full(ndr_pointer_list, g_free);
     ndr_pointer_list = (GSList *)g_slist_nth_data(list_ndr_pointer_list, current_depth);
     len_ndr_pointer_list = g_slist_length(ndr_pointer_list);
 
diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c
index ab48f6e9cb..2d18a065e9 100644
--- a/epan/dissectors/packet-dof.c
+++ b/epan/dissectors/packet-dof.c
@@ -3409,32 +3409,9 @@ static void* secmode_list_copy_cb(void *n, const void *o, size_t siz _U_)
     secmode_field_t *new_rec = (secmode_field_t *)n;
     const secmode_field_t *old_rec = (const secmode_field_t *)o;
 
-    if (old_rec->domain)
-    {
-        new_rec->domain = g_strdup(old_rec->domain);
-    }
-    else
-    {
-        new_rec->domain = NULL;
-    }
-
-    if (old_rec->identity)
-    {
-        new_rec->identity = g_strdup(old_rec->identity);
-    }
-    else
-    {
-        new_rec->identity = NULL;
-    }
-
-    if (old_rec->kek)
-    {
-        new_rec->kek = g_strdup(old_rec->kek);
-    }
-    else
-    {
-        new_rec->kek = NULL;
-    }
+    new_rec->domain = g_strdup(old_rec->domain);
+    new_rec->identity = g_strdup(old_rec->identity);
+    new_rec->kek = g_strdup(old_rec->kek);
 
     return new_rec;
 }
@@ -3443,12 +3420,9 @@ static void secmode_list_free_cb(void *r)
 {
     secmode_field_t *rec = (secmode_field_t *)r;
 
-    if (rec->domain)
-        g_free(rec->domain);
-    if (rec->identity)
-        g_free(rec->identity);
-    if (rec->kek)
-        g_free(rec->kek);
+    g_free(rec->domain);
+    g_free(rec->identity);
+    g_free(rec->kek);
 }
 
 
@@ -3477,14 +3451,7 @@ static void* seckey_list_copy_cb(void *n, const void *o, size_t siz _U_)
     seckey_field_t *new_rec = (seckey_field_t *)n;
     const seckey_field_t *old_rec = (const seckey_field_t *)o;
 
-    if (old_rec->key)
-    {
-        new_rec->key = g_strdup(old_rec->key);
-    }
-    else
-    {
-        new_rec->key = NULL;
-    }
+    new_rec->key = g_strdup(old_rec->key);
 
     return new_rec;
 }
@@ -3493,8 +3460,7 @@ static void seckey_list_free_cb(void *r)
 {
     seckey_field_t *rec = (seckey_field_t *)r;
 
-    if (rec->key)
-        g_free(rec->key);
+    g_free(rec->key);
 }
 
 
@@ -3557,32 +3523,9 @@ static void* identsecret_list_copy_cb(void *n, const void *o, size_t siz _U_)
     identsecret_field_t *new_rec = (identsecret_field_t *)n;
     const identsecret_field_t *old_rec = (const identsecret_field_t *)o;
 
-    if (old_rec->domain)
-    {
-        new_rec->domain = g_strdup(old_rec->domain);
-    }
-    else
-    {
-        new_rec->domain = NULL;
-    }
-
-    if (old_rec->identity)
-    {
-        new_rec->identity = g_strdup(old_rec->identity);
-    }
-    else
-    {
-        new_rec->identity = NULL;
-    }
-
-    if (old_rec->secret)
-    {
-        new_rec->secret = g_strdup(old_rec->secret);
-    }
-    else
-    {
-        new_rec->secret = NULL;
-    }
+    new_rec->domain = g_strdup(old_rec->domain);
+    new_rec->identity = g_strdup(old_rec->identity);
+    new_rec->secret = g_strdup(old_rec->secret);
 
     return new_rec;
 }
@@ -3591,12 +3534,9 @@ static void identsecret_list_free_cb(void *r)
 {
     identsecret_field_t *rec = (identsecret_field_t *)r;
 
-    if (rec->domain)
-        g_free(rec->domain);
-    if (rec->identity)
-        g_free(rec->identity);
-    if (rec->secret)
-        g_free(rec->secret);
+    g_free(rec->domain);
+    g_free(rec->identity);
+    g_free(rec->secret);
 }
 
 static void init_addr_port_tables(void);
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index cc61d3d1b4..ec984dac2f 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -6351,14 +6351,8 @@ proto_reg_handoff_dvbci(void)
     tcp_dissector_table = find_dissector_table("tcp.port");
     udp_dissector_table = find_dissector_table("udp.port");
 
-    if (dvbci_sek_bin) {
-        g_free(dvbci_sek_bin);
-        dvbci_sek_bin = NULL;
-    }
-    if (dvbci_siv_bin) {
-        g_free(dvbci_siv_bin);
-        dvbci_siv_bin = NULL;
-    }
+    g_free(dvbci_sek_bin);
+    g_free(dvbci_siv_bin);
     pref_key_string_to_bin(dvbci_sek, &dvbci_sek_bin);
     pref_key_string_to_bin(dvbci_siv, &dvbci_siv_bin);
 }
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 0147b94f6b..162ce20d0e 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -2324,9 +2324,7 @@ static void
 free_key(gpointer ptr)
 {
 	duplication_key *key = (duplication_key *)ptr;
-
-	if(key)
-		g_slice_free(duplication_key, key);
+	g_slice_free(duplication_key, key);
 }
 
 /* removes the table entries of a specific transfer */
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 56d7efa102..a12e8a2339 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -445,9 +445,7 @@ static void
 sm_fragment_free_temporary_key(gpointer ptr)
 {
     sm_fragment_key *key = (sm_fragment_key *)ptr;
-
-    if(key)
-        g_slice_free(sm_fragment_key, key);
+    g_slice_free(sm_fragment_key, key);
 }
 
 static void
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 3fa12a6c7c..afba5ec4a3 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -211,17 +211,8 @@ header_fields_copy_cb(void* n, const void* o, size_t siz _U_)
 	header_field_t* new_rec = (header_field_t*)n;
 	const header_field_t* old_rec = (const header_field_t*)o;
 
-	if (old_rec->header_name) {
-		new_rec->header_name = g_strdup(old_rec->header_name);
-	} else {
-		new_rec->header_name = NULL;
-	}
-
-	if (old_rec->header_desc) {
-		new_rec->header_desc = g_strdup(old_rec->header_desc);
-	} else {
-		new_rec->header_desc = NULL;
-	}
+	new_rec->header_name = g_strdup(old_rec->header_name);
+	new_rec->header_desc = g_strdup(old_rec->header_desc);
 
 	return new_rec;
 }
@@ -231,10 +222,8 @@ header_fields_free_cb(void*r)
 {
 	header_field_t* rec = (header_field_t*)r;
 
-	if (rec->header_name)
-		g_free(rec->header_name);
-	if (rec->header_desc)
-		g_free(rec->header_desc);
+	g_free(rec->header_name);
+	g_free(rec->header_desc);
 }
 
 UAT_CSTRING_CB_DEF(header_fields, header_name, header_field_t)
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index ed0e7d46ca..574cb45f6c 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -146,11 +146,7 @@ uat_wep_key_record_copy_cb(void* n, const void* o, size_t siz _U_)
   uat_wep_key_record_t* new_key = (uat_wep_key_record_t *)n;
   const uat_wep_key_record_t* old_key = (const uat_wep_key_record_t *)o;
 
-  if (old_key->string) {
-    new_key->string = g_strdup(old_key->string);
-  } else {
-    new_key->string = NULL;
-  }
+  new_key->string = g_strdup(old_key->string);
 
   return new_key;
 }
@@ -210,8 +206,7 @@ static void
 uat_wep_key_record_free_cb(void*r)
 {
   uat_wep_key_record_t* key = (uat_wep_key_record_t *)r;
-
-  if (key->string) g_free(key->string);
+  g_free(key->string);
 }
 
 UAT_VS_DEF(uat_wep_key_records, key, uat_wep_key_record_t, guint8, 0, STRING_KEY_TYPE_WEP)
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 35b0523f45..b9306391c8 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -354,13 +354,13 @@ static void* uat_esp_sa_record_copy_cb(void* n, const void* o, size_t siz _U_) {
 
   /* Copy UAT fields */
   new_rec->protocol = old_rec->protocol;
-  new_rec->srcIP = (old_rec->srcIP) ? g_strdup(old_rec->srcIP) : NULL;
-  new_rec->dstIP = (old_rec->dstIP) ? g_strdup(old_rec->dstIP) : NULL;
-  new_rec->spi = (old_rec->spi) ? g_strdup(old_rec->spi) : NULL;
+  new_rec->srcIP = g_strdup(old_rec->srcIP);
+  new_rec->dstIP = g_strdup(old_rec->dstIP);
+  new_rec->spi = g_strdup(old_rec->spi);
   new_rec->encryption_algo = old_rec->encryption_algo;
-  new_rec->encryption_key_string = (old_rec->encryption_key_string) ? g_strdup(old_rec->encryption_key_string) : NULL;
+  new_rec->encryption_key_string = g_strdup(old_rec->encryption_key_string);
   new_rec->authentication_algo = old_rec->authentication_algo;
-  new_rec->authentication_key_string = (old_rec->authentication_key_string) ? g_strdup(old_rec->authentication_key_string) : NULL;
+  new_rec->authentication_key_string = g_strdup(old_rec->authentication_key_string);
 
   /* Parse keys as in an update */
   uat_esp_sa_record_update_cb(new_rec, NULL);
@@ -431,12 +431,7 @@ void esp_sa_record_add_from_dissector(guint8 protocol, const gchar *srcIP, const
 
    /* Authentication */
    record->authentication_algo = authentication_algo;
-   if (authentication_key) {
-      record->authentication_key_string = g_strdup(authentication_key);
-   }
-   else {
-      record->authentication_key_string = NULL;
-   }
+   record->authentication_key_string = g_strdup(authentication_key);
 
    /* Parse keys */
    uat_esp_sa_record_update_cb(record, NULL);
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index a94bbede62..8cfd0c3750 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -510,10 +510,7 @@ read_keytab_file_from_preferences(void)
 		return;
 	}
 
-	if (last_keytab != NULL) {
-		g_free(last_keytab);
-		last_keytab = NULL;
-	}
+	g_free(last_keytab);
 	last_keytab = g_strdup(keytab_filename);
 
 	read_keytab_file(last_keytab);
@@ -879,9 +876,9 @@ clear_keytab(void) {
 	for(ske = service_key_list; ske != NULL; ske = g_slist_next(ske)){
 		sk = (service_key_t *) ske->data;
 		if (sk) {
-					g_free(sk->contents);
-					g_free(sk);
-				}
+			g_free(sk->contents);
+			g_free(sk);
+		}
 	}
 	g_slist_free(service_key_list);
 	service_key_list = NULL;
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index d6637a6833..476f54b2cf 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -3197,8 +3197,7 @@ static void l2tp_cleanup(void)
     GSList *iterator = list_heads;
 
     while (iterator) {
-        if (iterator->data != NULL)
-            g_slist_free((GSList *)iterator->data);
+        g_slist_free((GSList *)iterator->data);
         iterator = g_slist_next(iterator);
     }
 
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 6756af34d6..6adb41d141 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -729,8 +729,8 @@ attribute_types_free_cb(void*r)
 {
   attribute_type_t* rec = (attribute_type_t*)r;
 
-  if (rec->attribute_type) g_free(rec->attribute_type);
-  if (rec->attribute_desc) g_free(rec->attribute_desc);
+  g_free(rec->attribute_type);
+  g_free(rec->attribute_desc);
 }
 
 UAT_CSTRING_CB_DEF(attribute_types, attribute_type, attribute_type_t)
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 5d64a96ae1..3ef2d672d6 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -204,9 +204,9 @@ static void* uat_ue_keys_record_copy_cb(void* n, const void* o, size_t siz _U_)
     const uat_ue_keys_record_t* old_rec = (const uat_ue_keys_record_t *)o;
 
     new_rec->ueid = old_rec->ueid;
-    new_rec->rrcCipherKeyString = (old_rec->rrcCipherKeyString) ? g_strdup(old_rec->rrcCipherKeyString) : NULL;
-    new_rec->upCipherKeyString = (old_rec->upCipherKeyString) ? g_strdup(old_rec->upCipherKeyString) : NULL;
-    new_rec->rrcIntegrityKeyString = (old_rec->rrcIntegrityKeyString) ? g_strdup(old_rec->rrcIntegrityKeyString) : NULL;
+    new_rec->rrcCipherKeyString = g_strdup(old_rec->rrcCipherKeyString);
+    new_rec->upCipherKeyString = g_strdup(old_rec->upCipherKeyString);
+    new_rec->rrcIntegrityKeyString = g_strdup(old_rec->rrcIntegrityKeyString);
 
     return new_rec;
 }
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 0268e1fc88..db9fa6300f 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -748,19 +748,14 @@ static void* uat_kindid_copy_cb(void* n, const void* o, size_t siz _U_) {
   kind_t * new_record = (kind_t *)n;
   const kind_t* old_record = (const kind_t *)o;
 
-  if (old_record->name) {
-    new_record->name = g_strdup(old_record->name);
-  } else {
-    new_record->name = NULL;
-  }
+  new_record->name = g_strdup(old_record->name);
 
   return new_record;
 }
 
 static void uat_kindid_record_free_cb(void*r) {
   kind_t* rec = (kind_t *)r;
-
-  if (rec->name) g_free(rec->name);
+  g_free(rec->name);
 }
 
 UAT_DEC_CB_DEF(kindidlist_uats,id,kind_t)
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index 4ddd5924d7..0d2ee5fd17 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -521,11 +521,7 @@ static void *sctp_chunk_type_copy_cb(void* n, const void* o, size_t siz _U_)
 {
   type_field_t* new_rec = (type_field_t*)n;
   const type_field_t* old_rec = (const type_field_t*)o;
-  if (old_rec->type_name) {
-    new_rec->type_name = g_strdup(old_rec->type_name);
-  } else {
-    new_rec->type_name = NULL;
-  }
+  new_rec->type_name = g_strdup(old_rec->type_name);
 
   return new_rec;
 }
@@ -534,7 +530,7 @@ static void
 sctp_chunk_type_free_cb(void* r)
 {
   type_field_t* rec = (type_field_t*)r;
-  if (rec->type_name) g_free(rec->type_name);
+  g_free(rec->type_name);
 }
 
 static gboolean
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 022233d6ea..429c72f6d8 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -954,17 +954,8 @@ header_fields_copy_cb(void* n, const void* o, size_t siz _U_)
     header_field_t* new_rec = (header_field_t*)n;
     const header_field_t* old_rec = (const header_field_t*)o;
 
-    if (old_rec->header_name) {
-        new_rec->header_name = g_strdup(old_rec->header_name);
-    } else {
-        new_rec->header_name = NULL;
-    }
-
-    if (old_rec->header_desc) {
-        new_rec->header_desc = g_strdup(old_rec->header_desc);
-    } else {
-        new_rec->header_desc = NULL;
-    }
+    new_rec->header_name = g_strdup(old_rec->header_name);
+    new_rec->header_desc = g_strdup(old_rec->header_desc);
 
     return new_rec;
 }
@@ -1078,23 +1069,9 @@ authorization_users_copy_cb(void* n, const void* o, size_t siz _U_)
     authorization_user_t* new_rec = (authorization_user_t*)n;
     const authorization_user_t* old_rec = (const authorization_user_t*)o;
 
-    if (old_rec->username) {
-        new_rec->username = g_strdup(old_rec->username);
-    } else {
-        new_rec->username = NULL;
-    }
-
-    if (old_rec->realm) {
-        new_rec->realm = g_strdup(old_rec->realm);
-    } else {
-        new_rec->realm = NULL;
-    }
-
-    if (old_rec->password) {
-        new_rec->password = g_strdup(old_rec->password);
-    } else {
-        new_rec->password = NULL;
-    }
+    new_rec->username = g_strdup(old_rec->username);
+    new_rec->realm = g_strdup(old_rec->realm);
+    new_rec->password = g_strdup(old_rec->password);
 
     return new_rec;
 }
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index aedc6bb83b..42fd1a64db 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -17348,8 +17348,7 @@ free_hash_tables(gpointer ctarg, gpointer user_data _U_)
 		g_hash_table_destroy(ct->primaries);
 	if (ct->tid_service)
 		g_hash_table_destroy(ct->tid_service);
-	if (ct->GSL_fid_info)
-		g_slist_free(ct->GSL_fid_info);
+	g_slist_free(ct->GSL_fid_info);
 	g_free(ct);
 }
 
diff --git a/epan/dissectors/packet-udp-nm.c b/epan/dissectors/packet-udp-nm.c
index 7bc94c025c..f827f95abd 100644
--- a/epan/dissectors/packet-udp-nm.c
+++ b/epan/dissectors/packet-udp-nm.c
@@ -147,31 +147,12 @@ user_data_fields_copy_cb(void* n, const void* o, size_t siz _U_)
   user_data_field_t* new_rec = (user_data_field_t*)n;
   const user_data_field_t* old_rec = (const user_data_field_t*)o;
 
-  if (old_rec->udf_name) {
-    new_rec->udf_name = g_strdup(old_rec->udf_name);
-  }
-  else {
-    new_rec->udf_name = NULL;
-  }
-
-  if (old_rec->udf_desc) {
-    new_rec->udf_desc = g_strdup(old_rec->udf_desc);
-  }
-  else {
-    new_rec->udf_desc = NULL;
-  }
-
-  new_rec->udf_offset = old_rec->udf_offset;
-  new_rec->udf_length = old_rec->udf_length;
-
-  new_rec->udf_mask = old_rec->udf_mask;
-
-  if (old_rec->udf_value_desc) {
-    new_rec->udf_value_desc = g_strdup(old_rec->udf_value_desc);
-  }
-  else {
-    new_rec->udf_value_desc = NULL;
-  }
+  new_rec->udf_name       = g_strdup(old_rec->udf_name);
+  new_rec->udf_desc       = g_strdup(old_rec->udf_desc);
+  new_rec->udf_offset     = old_rec->udf_offset;
+  new_rec->udf_length     = old_rec->udf_length;
+  new_rec->udf_mask       = old_rec->udf_mask;
+  new_rec->udf_value_desc = g_strdup(old_rec->udf_value_desc);
 
   return new_rec;
 }
@@ -181,9 +162,9 @@ user_data_fields_free_cb(void*r)
 {
   user_data_field_t* rec = (user_data_field_t*)r;
 
-  if (rec->udf_name) g_free(rec->udf_name);
-  if (rec->udf_desc) g_free(rec->udf_desc);
-  if (rec->udf_value_desc) g_free(rec->udf_value_desc);
+  g_free(rec->udf_name);
+  g_free(rec->udf_desc);
+  g_free(rec->udf_value_desc);
 }
 
 UAT_CSTRING_CB_DEF(user_data_fields, udf_name, user_data_field_t)
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index fb6a8d9d16..9e60ccebb0 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -5834,8 +5834,8 @@ static void *uat_umts_fp_record_copy_cb(void *n, const void *o, size_t siz _U_)
     uat_umts_fp_ep_and_ch_record_t *new_rec = (uat_umts_fp_ep_and_ch_record_t *)n;
     const uat_umts_fp_ep_and_ch_record_t *old_rec = (const uat_umts_fp_ep_and_ch_record_t *)o;
 
-    new_rec->srcIP = (old_rec->srcIP) ? g_strdup(old_rec->srcIP) : NULL;
-    new_rec->dstIP = (old_rec->dstIP) ? g_strdup(old_rec->dstIP) : NULL;
+    new_rec->srcIP = g_strdup(old_rec->srcIP);
+    new_rec->dstIP = g_strdup(old_rec->dstIP);
 
     return new_rec;
 }
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c
index 4a98d8a9df..354a87118b 100644
--- a/epan/dissectors/packet-zbee-nwk-gp.c
+++ b/epan/dissectors/packet-zbee-nwk-gp.c
@@ -550,16 +550,9 @@ uat_key_record_copy_cb(void *n, const void *o, size_t siz _U_)
     uat_key_record_t *new_key = (uat_key_record_t *)n;
     const uat_key_record_t *old_key = (const uat_key_record_t *)o;
 
-    if (old_key->string) {
-        new_key->string = g_strdup(old_key->string);
-    } else {
-        new_key->string = NULL;
-    }
-    if (old_key->label) {
-        new_key->label = g_strdup(old_key->label);
-    } else {
-        new_key->label = NULL;
-    }
+    new_key->string = g_strdup(old_key->string);
+    new_key->label = g_strdup(old_key->label);
+
     return new_key;
 }
 
@@ -568,12 +561,8 @@ static void
 uat_key_record_free_cb(void *r)
 {
     uat_key_record_t *key = (uat_key_record_t *)r;
-    if (key->string) {
-        g_free(key->string);
-    }
-    if (key->label) {
-        g_free(key->label);
-    }
+    g_free(key->string);
+    g_free(key->label);
 }
 
 /**
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index f9ffbb4990..be76a862d2 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -139,18 +139,8 @@ static void* uat_key_record_copy_cb(void* n, const void* o, size_t siz _U_) {
     uat_key_record_t* new_key = (uat_key_record_t *)n;
     const uat_key_record_t* old_key = (const uat_key_record_t *)o;
 
-    if (old_key->string) {
-        new_key->string = g_strdup(old_key->string);
-    } else {
-        new_key->string = NULL;
-    }
-
-    if (old_key->label) {
-        new_key->label = g_strdup(old_key->label);
-    } else {
-        new_key->label = NULL;
-    }
-
+    new_key->string     = g_strdup(old_key->string);
+    new_key->label      = g_strdup(old_key->label);
     new_key->byte_order = old_key->byte_order;
 
     return new_key;
@@ -184,8 +174,8 @@ static gboolean uat_key_record_update_cb(void* r, char** err) {
 static void uat_key_record_free_cb(void*r) {
     uat_key_record_t* key = (uat_key_record_t *)r;
 
-    if (key->string) g_free(key->string);
-    if (key->label) g_free(key->label);
+    g_free(key->string);
+    g_free(key->label);
 }
 
 static void uat_key_record_post_update(void) {
diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon
index 9010bf96a0..fe855d8ba9 100644
--- a/epan/dtd_grammar.lemon
+++ b/epan/dtd_grammar.lemon
@@ -62,8 +62,8 @@ static GPtrArray* g_ptr_array_join(GPtrArray* a, GPtrArray* b){
 %token_destructor {
 	(void) bd; /* Mark unused, similar to Q_UNUSED */
 	if ($$) {
-		if ($$->text) g_free($$->text);
-		if ($$->location) g_free($$->location);
+		g_free($$->text);
+		g_free($$->location);
 		g_free($$);
 	}
 }
@@ -96,8 +96,7 @@ doctype ::= TAG_START DOCTYPE_KW NAME(Name) OPEN_BRACKET dtd_parts CLOSE_BRACKET
 		bd->proto_name = Name->text;
 	}
 
-	if(bd->proto_root)
-		g_free(bd->proto_root);
+	g_free(bd->proto_root);
 
 	bd->proto_root = Name->text;
 
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index 37f3bcf5c4..4c250c252e 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -110,10 +110,10 @@ DIAG_OFF(sign-compare)
 
 	static dtd_build_data_t* build_data;
 
-	static void set_proto_name (gchar* val) { if(build_data->proto_name) g_free(build_data->proto_name); build_data->proto_name = g_strdup(val); }
-	static void set_media_type (gchar* val) { if(build_data->media_type) g_free(build_data->media_type); build_data->media_type = g_strdup(val); }
-	static void set_proto_root (gchar* val) { if(build_data->proto_root) g_free(build_data->proto_root); build_data->proto_root = g_strdup(val); }
-	static void set_description (gchar* val) { if(build_data->description) g_free(build_data->description); build_data->description = g_strdup(val); }
+	static void set_proto_name (gchar* val) { g_free(build_data->proto_name); build_data->proto_name = g_strdup(val); }
+	static void set_media_type (gchar* val) { g_free(build_data->media_type); build_data->media_type = g_strdup(val); }
+	static void set_proto_root (gchar* val) { g_free(build_data->proto_root); build_data->proto_root = g_strdup(val); }
+	static void set_description (gchar* val) { g_free(build_data->description); build_data->description = g_strdup(val); }
 	static void set_recursive (gchar* val) { build_data->recursion = ( g_ascii_strcasecmp(val,"yes") == 0 ) ? TRUE : FALSE; }
 
 #ifdef DEBUG_DTD_PARSER
@@ -244,7 +244,7 @@ squoted        ['][^\']*[']
 <XMLPI>{stop_xmlpi} BEGIN DTD;
 
 <LOCATION>{get_location_xmlpi} {
-	if(yyextra->location) g_free(yyextra->location);
+	g_free(yyextra->location);
 	yyextra->location = g_strdup(yytext);
 	BEGIN DONE;
 }
@@ -421,8 +421,7 @@ extern dtd_build_data_t* dtd_parse(GString* s) {
 
 	Dtd_Parse_lex_destroy(scanner);
 
-	if (state.location)
-		g_free(state.location);
+	g_free(state.location);
 
 	DtdParseFree(state.pParser, g_free);
 
diff --git a/epan/dtd_preparse.l b/epan/dtd_preparse.l
index d28137cb3a..f18e44a870 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -233,7 +233,7 @@ static const gchar* replace_entity(Dtd_PreParse_scanner_state_t* state, gchar* e
 const gchar* dtd_location(Dtd_PreParse_scanner_state_t* state) {
 	static gchar* loc = NULL;
 
-	if (loc) g_free(loc);
+	g_free(loc);
 
 	if (!state) return NULL;
 
diff --git a/epan/expert.c b/epan/expert.c
index c757634caf..4cf909c7c8 100644
--- a/epan/expert.c
+++ b/epan/expert.c
@@ -145,11 +145,7 @@ static void *uat_expert_copy_cb(void *n, const void *o, size_t siz _U_)
 	expert_level_entry_t       *new_record = (expert_level_entry_t*)n;
 	const expert_level_entry_t *old_record = (const expert_level_entry_t *)o;
 
-	if (old_record->field) {
-		new_record->field = g_strdup(old_record->field);
-	} else {
-		new_record->field = NULL;
-	}
+	new_record->field = g_strdup(old_record->field);
 
 	new_record->severity = old_record->severity;
 
@@ -160,8 +156,7 @@ static void uat_expert_free_cb(void*r)
 {
 	expert_level_entry_t *rec = (expert_level_entry_t *)r;
 
-	if (rec->field)
-		g_free(rec->field);
+	g_free(rec->field);
 }
 
 static void uat_expert_post_update_cb(void)
diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index d4de2ccb99..65a728dac2 100644
--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@@ -165,13 +165,9 @@ static void geoip_dat_cleanup(void) {
          * databases as they weren't created by GeoIP_new()
          * or GeoIP_open() */
         gi = g_array_index(geoip_dat_arr, GeoIP *, i);
-        if (gi) {
-            g_free(gi);
-        }
+        g_free(gi);
         gi = g_array_index(geoip_dat_arr, GeoIP *, i+1);
-        if (gi) {
-            g_free(gi);
-        }
+        g_free(gi);
         /* finally, free the array itself */
         g_array_free(geoip_dat_arr, TRUE);
         geoip_dat_arr = NULL;
diff --git a/epan/plugin_if.c b/epan/plugin_if.c
index 7006802a00..e14b9a8a97 100644
--- a/epan/plugin_if.c
+++ b/epan/plugin_if.c
@@ -353,8 +353,7 @@ ext_toolbar_add_entry( ext_toolbar_t * parent, ext_toolbar_item_t type, const gc
     if ( value_list != NULL && g_list_length(value_list) > 0 )
         entry->values = g_list_copy(value_list);
 
-    if ( regex )
-        entry->regex = g_strdup(regex);
+    entry->regex = g_strdup(regex);
 
     entry->is_required = is_required;
     entry->capture_only = capture_only;
diff --git a/epan/prefs.c b/epan/prefs.c
index 6dde10237c..168fa29f43 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3944,9 +3944,9 @@ pre_init_prefs(void)
 
     prefs.pr_format  = PR_FMT_TEXT;
     prefs.pr_dest    = PR_DEST_CMD;
-    if (prefs.pr_file) g_free(prefs.pr_file);
+    g_free(prefs.pr_file);
     prefs.pr_file    = g_strdup("wireshark.out");
-    if (prefs.pr_cmd) g_free(prefs.pr_cmd);
+    g_free(prefs.pr_cmd);
     prefs.pr_cmd     = g_strdup("lpr");
 
     prefs.gui_altern_colors = FALSE;
@@ -3959,14 +3959,14 @@ pre_init_prefs(void)
     prefs.gui_toolbar_main_style = TB_STYLE_ICONS;
     prefs.gui_toolbar_filter_style = TB_STYLE_TEXT;
     /* These will be g_freed, so they must be g_mallocated. */
-    if (prefs.gui_gtk2_font_name) g_free(prefs.gui_gtk2_font_name);
+    g_free(prefs.gui_gtk2_font_name);
 #ifdef _WIN32
     prefs.gui_gtk2_font_name         = g_strdup("Lucida Console 10");
 #else
     prefs.gui_gtk2_font_name         = g_strdup("Monospace 10");
 #endif
     /* We try to find the best font in the Qt code */
-    if (prefs.gui_qt_font_name) g_free(prefs.gui_qt_font_name);
+    g_free(prefs.gui_qt_font_name);
     prefs.gui_qt_font_name           = g_strdup("");
     prefs.gui_marked_fg.red          =     65535;
     prefs.gui_marked_fg.green        =     65535;
@@ -3980,9 +3980,9 @@ pre_init_prefs(void)
     prefs.gui_ignored_bg.red         =     65535;
     prefs.gui_ignored_bg.green       =     65535;
     prefs.gui_ignored_bg.blue        =     65535;
-    if (prefs.gui_colorized_fg) g_free(prefs.gui_colorized_fg);
+    g_free(prefs.gui_colorized_fg);
     prefs.gui_colorized_fg           = g_strdup("000000,000000,000000,000000,000000,000000,000000,000000,000000,000000");
-    if (prefs.gui_colorized_bg) g_free(prefs.gui_colorized_bg);
+    g_free(prefs.gui_colorized_bg);
     prefs.gui_colorized_bg           = g_strdup("ffc0c0,ffc0ff,e0c0e0,c0c0ff,c0e0e0,c0ffff,c0ffc0,ffffc0,e0e0c0,e0e0e0");
     prefs.st_client_fg.red           = 32767;
     prefs.st_client_fg.green         =     0;
@@ -4029,7 +4029,7 @@ pre_init_prefs(void)
     prefs.gui_fileopen_style         = FO_STYLE_LAST_OPENED;
     prefs.gui_recent_df_entries_max  = 10;
     prefs.gui_recent_files_count_max = 10;
-    if (prefs.gui_fileopen_dir) g_free(prefs.gui_fileopen_dir);
+    g_free(prefs.gui_fileopen_dir);
     prefs.gui_fileopen_dir           = g_strdup(get_persdatafile_dir());
     prefs.gui_fileopen_preview       = 3;
     prefs.gui_ask_unsaved            = TRUE;
@@ -4038,13 +4038,13 @@ pre_init_prefs(void)
     prefs.gui_update_enabled         = TRUE;
     prefs.gui_update_channel         = UPDATE_CHANNEL_STABLE;
     prefs.gui_update_interval        = 60*60*24; /* Seconds */
-    if (prefs.gui_webbrowser) g_free(prefs.gui_webbrowser);
+    g_free(prefs.gui_webbrowser);
     prefs.gui_webbrowser             = g_strdup("");
-    if (prefs.gui_window_title) g_free(prefs.gui_window_title);
+    g_free(prefs.gui_window_title);
     prefs.gui_window_title           = g_strdup("");
-    if (prefs.gui_prepend_window_title) g_free(prefs.gui_prepend_window_title);
+    g_free(prefs.gui_prepend_window_title);
     prefs.gui_prepend_window_title   = g_strdup("");
-    if (prefs.gui_start_title) g_free(prefs.gui_start_title);
+    g_free(prefs.gui_start_title);
     prefs.gui_start_title            = g_strdup("The World's Most Popular Network Protocol Analyzer");
     prefs.gui_version_placement      = version_both;
     prefs.gui_auto_scroll_on_expand  = FALSE;
@@ -4057,7 +4057,7 @@ pre_init_prefs(void)
     prefs.gui_packet_list_elide_mode = ELIDE_RIGHT;
     prefs.gui_packet_list_show_related = TRUE;
     prefs.gui_packet_list_show_minimap = TRUE;
-    if (prefs.gui_interfaces_hide_types) g_free (prefs.gui_interfaces_hide_types);
+    g_free (prefs.gui_interfaces_hide_types);
     prefs.gui_interfaces_hide_types = g_strdup("");
     prefs.gui_interfaces_show_hidden = FALSE;
 #ifdef HAVE_PCAP_REMOTE
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index e2dd13fd84..043c91e9ad 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -787,8 +787,7 @@ gboolean radius_load_dictionary (radius_dictionary_t* d, gchar* dir, const gchar
 	 */
 
 	for (i = 0; i < MAX_INCLUDE_DEPTH; i++) {
-		if (state.fullpaths[i])
-			g_free(state.fullpaths[i]);
+		g_free(state.fullpaths[i]);
 	}
 
 	g_hash_table_foreach(state.dict->attrs_by_id,setup_attrs,&state);
diff --git a/epan/reassemble.c b/epan/reassemble.c
index 231f911e3c..205bf26ec3 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -130,9 +130,7 @@ static void
 fragment_addresses_free_temporary_key(gpointer ptr)
 {
 	fragment_addresses_key *key = (fragment_addresses_key *)ptr;
-
-	if(key)
-		g_slice_free(fragment_addresses_key, key);
+	g_slice_free(fragment_addresses_key, key);
 }
 
 static void
@@ -268,9 +266,7 @@ static void
 fragment_addresses_ports_free_temporary_key(gpointer ptr)
 {
 	fragment_addresses_ports_key *key = (fragment_addresses_ports_key *)ptr;
-
-	if(key)
-		g_slice_free(fragment_addresses_ports_key, key);
+	g_slice_free(fragment_addresses_ports_key, key);
 }
 
 static void
diff --git a/epan/srt_table.c b/epan/srt_table.c
index 341a350416..6c98bf995b 100644
--- a/epan/srt_table.c
+++ b/epan/srt_table.c
@@ -224,11 +224,7 @@ init_srt_table(const char *name, const char *short_name, GArray *srt_array, int
     int i;
     srt_stat_table *table = g_new(srt_stat_table, 1);
 
-    if(filter_string){
-        table->filter_string=g_strdup(filter_string);
-    } else {
-        table->filter_string=NULL;
-    }
+    table->filter_string = g_strdup(filter_string);
 
     table->name = name;
     table->short_name = short_name;
diff --git a/epan/tap.c b/epan/tap.c
index 4760a3b302..b942383a3c 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -516,9 +516,7 @@ free_tap_listener(volatile tap_listener_t *tl)
 {
 	if(!tl)
 		return;
-	if(tl->code){
-		dfilter_free(tl->code);
-	}
+	dfilter_free(tl->code);
 	g_free(tl->fstring);
 DIAG_OFF(cast-qual)
 	g_free((gpointer)tl);
diff --git a/epan/wslua/lrexlib_glib.c b/epan/wslua/lrexlib_glib.c
index 6426dfb610..a19d31ad26 100644
--- a/epan/wslua/lrexlib_glib.c
+++ b/epan/wslua/lrexlib_glib.c
@@ -161,8 +161,7 @@ typedef struct {
 } TGrgx;
 
 static void minfo_free(TGrgx* ud) {
-  if (ud->match_info)
-    g_match_info_free (ud->match_info);
+  g_match_info_free (ud->match_info);
   ud->match_info = NULL;
 }
 
diff --git a/epan/wslua/wslua_capture_info.c b/epan/wslua/wslua_capture_info.c
index 9014552744..323ca8079c 100644
--- a/epan/wslua/wslua_capture_info.c
+++ b/epan/wslua/wslua_capture_info.c
@@ -90,8 +90,7 @@ WSLUA_METAMETHOD CaptureInfo__tostring(lua_State* L) {
 
 static int CaptureInfo__gc(lua_State* L) {
     CaptureInfo fc = toCaptureInfo(L,1);
-    if (fc)
-        g_free(fc);
+    g_free(fc);
     return 0;
 }
 
@@ -484,8 +483,7 @@ static int CaptureInfoConst_set_private_table(lua_State* L) {
 
 static int CaptureInfoConst__gc(lua_State* L) {
     CaptureInfoConst fi = toCaptureInfoConst(L,1);
-    if (fi)
-        g_free(fi);
+    g_free(fi);
     return 0;
 }
 
diff --git a/epan/wslua/wslua_dir.c b/epan/wslua/wslua_dir.c
index 3a9d50b285..5c12ca1353 100644
--- a/epan/wslua/wslua_dir.c
+++ b/epan/wslua/wslua_dir.c
@@ -210,7 +210,7 @@ WSLUA_CONSTRUCTOR Dir_open(lua_State* L) {
     dir = (Dir)g_malloc(sizeof(struct _wslua_dir));
     dir->dir = g_dir_open(dirname_clean, 0, dir->dummy);
     g_free(dirname_clean);
-    dir->ext = extension ? g_strdup(extension) : NULL;
+    dir->ext = g_strdup(extension);
     dir->dummy = (GError **)g_malloc(sizeof(GError *));
     *(dir->dummy) = NULL;
 
@@ -348,9 +348,7 @@ static int Dir__gc(lua_State* L) {
     }
 
     g_free(dir->dummy);
-
-    if (dir->ext) g_free(dir->ext);
-
+    g_free(dir->ext);
     g_free(dir);
 
     return 0;
diff --git a/epan/wslua/wslua_file.c b/epan/wslua/wslua_file.c
index cc11d07a1c..79bf4f7a3d 100644
--- a/epan/wslua/wslua_file.c
+++ b/epan/wslua/wslua_file.c
@@ -474,8 +474,7 @@ WSLUA_METAMETHOD File__tostring(lua_State* L) {
 /* We free the struct we malloc'ed, but not the FILE_T/dumper in it of course */
 static int File__gc(lua_State* L) {
     File f = toFile(L,1);
-    if (f)
-        g_free(f);
+    g_free(f);
     return 0;
 }
 
diff --git a/epan/wslua/wslua_frame_info.c b/epan/wslua/wslua_frame_info.c
index 0918505933..bca83fd96e 100644
--- a/epan/wslua/wslua_frame_info.c
+++ b/epan/wslua/wslua_frame_info.c
@@ -112,8 +112,7 @@ WSLUA_METHOD FrameInfo_read_data(lua_State* L) {
 /* free the struct we created, but not the phdr/buf it points to */
 static int FrameInfo__gc(lua_State* L) {
     FrameInfo fi = toFrameInfo(L,1);
-    if (fi)
-        g_free(fi);
+    g_free(fi);
     return 0;
 }
 
@@ -322,8 +321,7 @@ WSLUA_METHOD FrameInfoConst_write_data(lua_State* L) {
 /* free the struct we created, but not the wtap_pkthdr it points to */
 static int FrameInfoConst__gc(lua_State* L) {
     FrameInfoConst fi = toFrameInfoConst(L,1);
-    if (fi)
-        g_free(fi);
+    g_free(fi);
     return 0;
 }
 
diff --git a/epan/wslua/wslua_listener.c b/epan/wslua/wslua_listener.c
index 0acb279479..0110774029 100644
--- a/epan/wslua/wslua_listener.c
+++ b/epan/wslua/wslua_listener.c
@@ -216,7 +216,7 @@ WSLUA_CONSTRUCTOR Listener_new(lua_State* L) {
     tap = (Listener)g_malloc(sizeof(struct _wslua_tap));
 
     tap->name = g_strdup(tap_type);
-    tap->filter = filter ? g_strdup(filter) : NULL;
+    tap->filter = g_strdup(filter);
     tap->extractor = wslua_get_tap_extractor(tap_type);
     tap->L = L;
     tap->packet_ref = LUA_NOREF;