- fixed memory corruption in poller (Alexei)

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

1 files changed, 6 insertions, 2 deletions

diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c
index e87a3c46..ffae08e2 100644
--- a/src/zabbix_server/poller/poller.c
+++ b/src/zabbix_server/poller/poller.c
@@ -321,8 +321,6 @@ int get_values(void)
 				continue;
 			}
 			DBget_item_from_db(&item,row2);
-
-			DBfree_result(result2);
 		}
 		else
 		{
@@ -463,6 +461,12 @@ int get_values(void)
 			zabbix_log( LOG_LEVEL_CRIT, "Unknown response code returned.");
 			assert(0==1);
 		}
+		/* Poller for unreachable hosts */
+		if(poller_type == ZBX_POLLER_TYPE_UNREACHABLE)
+		{
+			/* We cannot freeit earlier because items has references to the structure */
+			DBfree_result(result2);
+		}
 		free_result(&agent);
 		DBcommit();
 	}