--- libaitcfg/src/aitcfg.c	2019/12/05 14:32:36	1.13.8.1
+++ libaitcfg/src/aitcfg.c	2025/08/19 11:43:53	1.17
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.c,v 1.13.8.1 2019/12/05 14:32:36 misho Exp $
+* $Id: aitcfg.c,v 1.17 2025/08/19 11:43:53 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2019
+Copyright 2004 - 2025
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -157,6 +157,29 @@ cfgEndConfig(cfg_root_t **pcfg)
 }
 
 /*
+ * cfgInitConfigExt() - Init existed config root
+ *
+ * @cfg = Config root
+ * return: -1 error or 0 inited config root
+ */
+int
+cfgInitConfigExt(cfg_root_t * __restrict cfg)
+{
+	if (!cfg) {
+		cfg_SetErr(EINVAL, "Invalid parameter");
+		return -1;
+	}
+
+	memset(cfg, 0, sizeof(cfg_root_t));
+
+	pthread_mutex_init(&cfg->rc_mtx, NULL);
+
+	TAILQ_INIT(cfg);
+	RB_INIT(cfg);
+	return 0;
+}
+
+/*
  * cfgLoadConfig() - Load config from file
  *
  * @cfgName = Config filename
@@ -169,14 +192,9 @@ cfgLoadConfig(const char *cfgName, cfg_root_t * __rest
 	FILE *f;
 	int ret;
 
-	if (!cfgName || !cfg) {
+	if (!cfgName || cfgInitConfigExt(cfg)) {
 		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
-	} else {
-		pthread_mutex_init(&cfg->rc_mtx, NULL);
-
-		TAILQ_INIT(cfg);
-		RB_INIT(cfg);
 	}
 
 	f = fopen(cfgName, "r");
@@ -232,6 +250,7 @@ cfgUnloadConfig(cfg_root_t * __restrict cfg)
 
 	cfgClearConfig(cfg);
 	pthread_mutex_destroy(&cfg->rc_mtx);
+	memset(&cfg->rc_mtx, 0, sizeof cfg->rc_mtx);
 }
 
 /*
@@ -257,7 +276,7 @@ cfgCreateConfig(const char *csConfigName, cfg_root_t *
 		return -1;
 	}
 	
-	ret = cfgWriteConfig(f, cfg, whitespace);
+	ret = cfgWriteConfigRaw(f, cfg, whitespace);
 
 	fclose(f);
 	return ret;
@@ -321,6 +340,8 @@ cfgLoadPasswd(const char *pwdName, pwd_root_t * __rest
 		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
 	} else {
+		memset(pwd, 0, sizeof(pwd_root_t));
+
 		pthread_mutex_init(&pwd->pwd_mtx, NULL);
 
 		SLIST_INIT(pwd);