session_server: only free attr_p if it was allocated before

Author: Michal Struwe

src/session_server.c

@@ -854,9 +854,11 @@ nc_server_init(void)
         goto error;
     }
 
+#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
     if (attr_p) {
         pthread_rwlockattr_destroy(attr_p);
     }
+#endif
 
 #ifdef NC_ENABLED_SSH_TLS
     if (curl_global_init(CURL_GLOBAL_SSL | CURL_GLOBAL_ACK_EINTR)) {
@@ -898,9 +900,11 @@ nc_server_init(void)
     return 0;
 
 error:
+#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
     if (attr_p) {
         pthread_rwlockattr_destroy(attr_p);
     }
+#endif
     return -1;
 }
 
@@ -2766,11 +2770,14 @@ nc_connect_ch_endpt(struct nc_ch_endpt *endpt, nc_server_ch_session_acquire_ctx_
     const struct ly_ctx *ctx = NULL;
     int sock, ret;
     struct timespec ts_cur;
-    char *ip_host;
+    char *ip_host = NULL;
 
     sock = nc_sock_connect(endpt->src_addr, endpt->src_port, endpt->dst_addr, endpt->dst_port,
             NC_CH_CONNECT_TIMEOUT, &endpt->ka, &endpt->sock_pending, &ip_host);
     if (sock < 0) {
+        if (ip_host) {
+            free(ip_host);
+        }
         return NC_MSG_ERROR;
     }
 
@@ -3990,6 +3997,7 @@ nc_server_notif_cert_exp_thread(void *arg)
 
             /* config changed, reload the certificates and intervals */
             nc_server_notif_cert_exp_dates_destroy(exp_dates, exp_date_count);
+            exp_dates = NULL;
 
             nc_server_notif_cert_exp_intervals_get(default_intervals, 3, &intervals, &interval_count);
 
@@ -4030,7 +4038,9 @@ nc_server_notif_cert_exp_thread(void *arg)
     if (targ->clb_free_data) {
         targ->clb_free_data(targ->clb_data);
     }
-    nc_server_notif_cert_exp_dates_destroy(exp_dates, exp_date_count);
+    if (exp_dates) {
+        nc_server_notif_cert_exp_dates_destroy(exp_dates, exp_date_count);
+    }
     free(targ);
     return NULL;
 }