From 47768758d6841a78583922cf163590d6baf0782e Mon Sep 17 00:00:00 2001
From: Hamish Coleman <hamish@zot.org>
Date: Sun, 8 May 2022 17:45:39 +0100
Subject: [PATCH] Fix use before null check

---
 src/sn_utils.c        | 6 ++++--
 src/transform_aes.c   | 5 ++---
 src/transform_cc20.c  | 5 ++---
 src/transform_speck.c | 5 ++---
 src/transform_tf.c    | 5 ++---
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/sn_utils.c b/src/sn_utils.c
index f325c26..2b24fa3 100644
--- a/src/sn_utils.c
+++ b/src/sn_utils.c
@@ -1348,8 +1348,10 @@ static int re_register_and_purge_supernodes (n2n_sn_t *sss, struct sn_community
         }
 
         // purge long-time-not-seen supernodes
-        purge_expired_nodes(&(comm->edges), sss->sock, &sss->tcp_connections, p_last_re_reg_and_purge,
-                            RE_REG_AND_PURGE_FREQUENCY, LAST_SEEN_SN_INACTIVE);
+        if (comm) {
+            purge_expired_nodes(&(comm->edges), sss->sock, &sss->tcp_connections, p_last_re_reg_and_purge,
+                                RE_REG_AND_PURGE_FREQUENCY, LAST_SEEN_SN_INACTIVE);
+        }
     }
 
     if(comm != NULL) {
diff --git a/src/transform_aes.c b/src/transform_aes.c
index d147287..2a3ab23 100644
--- a/src/transform_aes.c
+++ b/src/transform_aes.c
@@ -41,10 +41,9 @@ static int transop_deinit_aes (n2n_trans_op_t *arg) {
 
     transop_aes_t *priv = (transop_aes_t *)arg->priv;
 
-    if(priv->ctx)
-        aes_deinit(priv->ctx);
-
     if(priv)
+        if(priv->ctx)
+            aes_deinit(priv->ctx);
         free(priv);
 
     return 0;
diff --git a/src/transform_cc20.c b/src/transform_cc20.c
index 5cf9eb4..445627f 100644
--- a/src/transform_cc20.c
+++ b/src/transform_cc20.c
@@ -33,10 +33,9 @@ static int transop_deinit_cc20 (n2n_trans_op_t *arg) {
 
     transop_cc20_t *priv = (transop_cc20_t *)arg->priv;
 
-    if(priv->ctx)
-        cc20_deinit(priv->ctx);
-
     if(priv)
+        if(priv->ctx)
+            cc20_deinit(priv->ctx);
         free(priv);
 
     return 0;
diff --git a/src/transform_speck.c b/src/transform_speck.c
index 1778eb7..3b126cc 100644
--- a/src/transform_speck.c
+++ b/src/transform_speck.c
@@ -33,10 +33,9 @@ static int transop_deinit_speck (n2n_trans_op_t *arg) {
 
     transop_speck_t *priv = (transop_speck_t *)arg->priv;
 
-    if(priv->ctx)
-        speck_deinit(priv->ctx);
-
     if(priv)
+        if(priv->ctx)
+            speck_deinit(priv->ctx);
         free(priv);
 
     return 0;
diff --git a/src/transform_tf.c b/src/transform_tf.c
index 4368d03..4adf6bc 100644
--- a/src/transform_tf.c
+++ b/src/transform_tf.c
@@ -41,10 +41,9 @@ static int transop_deinit_tf (n2n_trans_op_t *arg) {
 
     transop_tf_t *priv = (transop_tf_t *)arg->priv;
 
-    if(priv->ctx)
-        tf_deinit(priv->ctx);
-
     if(priv)
+        if(priv->ctx)
+            tf_deinit(priv->ctx);
         free(priv);
 
     return 0;