--- libaitcfg/src/queue.c	2008/08/28 13:17:41	1.1
+++ libaitcfg/src/queue.c	2009/10/19 15:00:10	1.3
@@ -1,3 +1,11 @@
+/*************************************************************************
+* (C) 2008 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: queue.c,v 1.3 2009/10/19 15:00:10 misho Exp $
+*
+*************************************************************************/
 #include "global.h"
 #include "aitcfg.h"
 
@@ -133,6 +141,7 @@ int cfg_UnsetAttribute(sl_config * __restrict cfg, con
 int cfg_SetAttribute(sl_config * __restrict cfg, const u_char *csSec, const u_char *csAttr, const u_char *csVal)
 {
 	struct tagPair *av, *section;
+	int len;
 
 	if (!cfg || !csAttr)
 		return -1;
@@ -160,32 +169,33 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const
 		}
 		// added section name to element
 		if (csSec && *csSec) {
-			av->psSection = malloc(strlen((char*) csSec) + 1);
+			len = strlen((char*) csSec) + 1;
+			av->psSection = malloc(len);
 			if (!av->psSection) {
 				LOGERR;
 				free(av);
 				return -1;
 			} else {
-				memset(av->psSection, 0, strlen((char*) csSec) + 1);
-				strcpy((char*) av->psSection, (char*) csSec);
+				strlcpy((char*) av->psSection, (char*) csSec, len);
 			}
 		} else
 			av->psSection = NULL;
 
 		// added attribute to element
-		av->psAttribute = malloc(strlen((char*) csAttr) + 1);
+		len = strlen((char*) csAttr) + 1;
+		av->psAttribute = malloc(len);
 		if (!av->psAttribute) {
 			LOGERR;
 			free(av->psSection);
 			free(av);
 			return -1;
 		} else {
-			memset(av->psAttribute, 0, strlen((char*) csAttr) + 1);
-			strcpy((char*) av->psAttribute, (char*) csAttr);
+			strlcpy((char*) av->psAttribute, (char*) csAttr, len);
 		}
 		// added value to element
 		if (csVal && *csVal) {
-			av->psValue = malloc(strlen((char*) csVal) + 1);
+			len = strlen((char*) csVal) + 1;
+			av->psValue = malloc(len);
 			if (!av->psValue) {
 				LOGERR;
 				free(av->psAttribute);
@@ -193,8 +203,7 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const
 				free(av);
 				return -1;
 			} else {
-				memset(av->psValue, 0, strlen((char*) csVal) + 1);
-				strcpy((char*) av->psValue, (char*) csVal);
+				strlcpy((char*) av->psValue, (char*) csVal, len);
 			}
 		} else {
 			av->psValue = malloc(1);
@@ -206,9 +215,9 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const
 	}
 
 	if (strcmp((char*) csVal, (char*) av->psValue)) {
-		av->psValue = realloc(av->psValue, strlen((char*) csVal) + 1);
-		memset(av->psValue, 0, strlen((char*) csVal) + 1);
-		strcpy((char*) av->psValue, (char*) csVal);
+		len = strlen((char*) csVal) + 1;
+		av->psValue = realloc(av->psValue, len);
+		strlcpy((char*) av->psValue, (char*) csVal, len);
 
 		// Update element
 		return 1;
@@ -260,11 +269,10 @@ int cfg_LoadAttribute(sl_config * __restrict cfg, cons
 	if (!cfg || !csAttr || !ValLen || !psVal)
 		return -1;
 
-	memset(psVal, 0, ValLen);
 	av = SelectAttribute(cfg, csSec, csAttr);
 	if (!av) {
 		if (csDefValue) {
-			strncpy((char*) psVal, csDefValue, ValLen - 1);
+			strlcpy((char*) psVal, csDefValue, ValLen);
 			ret = strlen((char*) psVal);
 		}
 
@@ -273,11 +281,11 @@ int cfg_LoadAttribute(sl_config * __restrict cfg, cons
 
 	if (!av->psValue || !*av->psValue) {
 		if (csDefValue) {
-			strncpy((char*) psVal, csDefValue, ValLen - 1);
+			strlcpy((char*) psVal, csDefValue, ValLen);
 			ret = strlen((char*) psVal);
 		}
 	} else {
-		strncpy((char*) psVal, (char*) av->psValue, ValLen - 1);
+		strlcpy((char*) psVal, (char*) av->psValue, ValLen);
 		ret = strlen((char*) psVal);
 	}