3 files changed, 3 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index fcaa9c1b..8bb0fcb2 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ This file documents the major additions and syntax changes between releases.
         Make check_snmp work more like v1.4.14 with regard to using special values (Timeticks, STRING) as numeric thresholds
         Fix check_ldap overriding the port when --ssl was specified after -p
         Fix check_procs where regex input of '|' would get displayed in output - now replaced with ','
+        Fix segfault in check_host when hostname returns multiple IP addresses (Sebastian Harl)
 
 1.4.15 27th July 2010
         ENHANCEMENTS
diff --git a/THANKS.in b/THANKS.in
index cb8d26cf..c6775bcd 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -268,3 +268,4 @@ Brian Landers
 Ryan Kelly
 Stéphane Urbanovski
 Marco Beck
+Sebastian Harl
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 6d8ba099..fe8fc56f 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -621,7 +621,7 @@ main(int argc, char **argv)
         }
 
         host = list;
-        table = malloc(sizeof(struct rta_host **) * (argc - 1));
+        table = malloc(sizeof(struct rta_host **) * targets);
         i = 0;
         while(host) {
                 host->id = i*packets;