--- libaitcfg/src/queue.c	2009/09/09 09:07:31	1.2
+++ libaitcfg/src/queue.c	2009/10/19 15:00:10	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: queue.c,v 1.2 2009/09/09 09:07:31 misho Exp $
+* $Id: queue.c,v 1.3 2009/10/19 15:00:10 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -141,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;
@@ -168,30 +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 {
-				strlcpy((char*) av->psSection, (char*) csSec, strlen((char*) csSec) + 1);
+				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 {
-			strlcpy((char*) av->psAttribute, (char*) csAttr, strlen((char*) csAttr) + 1);
+			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);
@@ -199,7 +203,7 @@ int cfg_SetAttribute(sl_config * __restrict cfg, const
 				free(av);
 				return -1;
 			} else {
-				strlcpy((char*) av->psValue, (char*) csVal, strlen((char*) csVal) + 1);
+				strlcpy((char*) av->psValue, (char*) csVal, len);
 			}
 		} else {
 			av->psValue = malloc(1);
@@ -211,8 +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);
-		strlcpy((char*) av->psValue, (char*) csVal, strlen((char*) csVal) + 1);
+		len = strlen((char*) csVal) + 1;
+		av->psValue = realloc(av->psValue, len);
+		strlcpy((char*) av->psValue, (char*) csVal, len);
 
 		// Update element
 		return 1;