calls to malloc+strcpy changed to strdup() (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@302 97f52cf1-0a1b-0410-bd0e-c28be96e8082

7 files changed, 14 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 371e4311..21dbbeb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.0beta2:
 
+ - calls to malloc+strcpy changed to strdup() (Alexei) 
  - fix of parameter Server in zabbix_agentd.conf (Alexei)
  - fix of System Map image (Alexei)
 
diff --git a/src/zabbix_agent/sysinfo.c b/src/zabbix_agent/sysinfo.c
index fccd8cbd..08762ba3 100644
--- a/src/zabbix_agent/sysinfo.c
+++ b/src/zabbix_agent/sysinfo.c
@@ -165,13 +165,11 @@ void	add_user_parameter(char *key,char *command)
 	{
 		if( commands[i].key == 0)
 		{
-			commands[i].key=(char *)malloc(strlen(key)+1);
-			strcpy(commands[i].key,key);
+			commands[i].key=strdup(key);
 
 			commands[i].function=&EXECUTE;
 
-			commands[i].parameter=(char *)malloc(strlen(command)+1);
-			strcpy(commands[i].parameter,command);
+			commands[i].parameter=strdup(command);
 
 			commands[i+1].key = 0;
 			
diff --git a/src/zabbix_agent/zabbix_agent.c b/src/zabbix_agent/zabbix_agent.c
index 853f73c9..07032ded 100644
--- a/src/zabbix_agent/zabbix_agent.c
+++ b/src/zabbix_agent/zabbix_agent.c
@@ -81,8 +81,7 @@ void	process_config_file(void)
 
 		if(strcmp(parameter,"Server")==0)
 		{
-			config_host_allowed=(char *)malloc(strlen(value));
-			strcpy(config_host_allowed,value);
+			config_host_allowed=strdup(value);
 		}
 		else if(strcmp(parameter,"UserParameter")==0)
 		{
@@ -113,14 +112,11 @@ void	process_config_file(void)
 int	check_security(void)
 {
 	char	*sname;
-	char	*config;
 	struct	sockaddr_in name;
 	int	i;
 
 	if(getpeername(0,  (struct sockaddr *)&name, (size_t *)&i) == 0)
 	{
-		config=(char *)malloc(16);
-
 		i=sizeof(struct sockaddr_in);
 
 		sname=inet_ntoa(name.sin_addr);
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index a9eadfae..9bab0247 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -160,8 +160,7 @@ void	process_config_file(void)
 
 		if(strcmp(parameter,"Server")==0)
 		{
-			config_host_allowed=(char *)malloc(strlen(value)+1);
-			strcpy(config_host_allowed,value);
+			config_host_allowed=strdup(value);
 		}
 		else if(strcmp(parameter,"StartAgents")==0)
 		{
diff --git a/src/zabbix_sucker/zabbix_sucker.c b/src/zabbix_sucker/zabbix_sucker.c
index cb69dbf3..92ad5fe5 100644
--- a/src/zabbix_sucker/zabbix_sucker.c
+++ b/src/zabbix_sucker/zabbix_sucker.c
@@ -202,18 +202,15 @@ void	process_config_file(void)
 		}
 		else if(strcmp(parameter,"DBName")==0)
 		{
-			CONFIG_DBNAME=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBNAME,value);
+			CONFIG_DBNAME=strdup(value);
 		}
 		else if(strcmp(parameter,"DBUser")==0)
 		{
-			CONFIG_DBUSER=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBUSER,value);
+			CONFIG_DBUSER=strdup(value);
 		}
 		else if(strcmp(parameter,"DBPassword")==0)
 		{
-			CONFIG_DBPASSWORD=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBPASSWORD,value);
+			CONFIG_DBPASSWORD=strdup(value);
 		}
 		else
 		{
diff --git a/src/zabbix_trapper/zabbix_trapper.c b/src/zabbix_trapper/zabbix_trapper.c
index 786374ef..1aa887bd 100644
--- a/src/zabbix_trapper/zabbix_trapper.c
+++ b/src/zabbix_trapper/zabbix_trapper.c
@@ -110,18 +110,15 @@ void	process_config_file(void)
 		}
 		else if(strcmp(parameter,"DBName")==0)
 		{
-			CONFIG_DBNAME=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBNAME,value);
+			CONFIG_DBNAME=strdup(value);
 		}
 		else if(strcmp(parameter,"DBUser")==0)
 		{
-			CONFIG_DBUSER=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBUSER,value);
+			CONFIG_DBUSER=strdup(value);
 		}
 		else if(strcmp(parameter,"DBPassword")==0)
 		{
-			CONFIG_DBPASSWORD=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBPASSWORD,value);
+			CONFIG_DBPASSWORD=strdup(value);
 		}
 		else
 		{
diff --git a/src/zabbix_trapper/zabbix_trapperd.c b/src/zabbix_trapper/zabbix_trapperd.c
index 70dada14..a8a1f4fb 100644
--- a/src/zabbix_trapper/zabbix_trapperd.c
+++ b/src/zabbix_trapper/zabbix_trapperd.c
@@ -126,18 +126,15 @@ void	process_config_file(void)
 		}
 		else if(strcmp(parameter,"DBName")==0)
 		{
-			CONFIG_DBNAME=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBNAME,value);
+			CONFIG_DBNAME=strdup(value);
 		}
 		else if(strcmp(parameter,"DBUser")==0)
 		{
-			CONFIG_DBUSER=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBUSER,value);
+			CONFIG_DBUSER=strdup(value);
 		}
 		else if(strcmp(parameter,"DBPassword")==0)
 		{
-			CONFIG_DBPASSWORD=(char *)malloc(strlen(value));
-			strcpy(CONFIG_DBPASSWORD,value);
+			CONFIG_DBPASSWORD=strdup(value);
 		}
 		else
 		{