Merging upstream version 1.11.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/library/Director/PropertyModifier/PropertyModifierGetHostByName.php b/library/Director/PropertyModifier/PropertyModifierGetHostByName.php
index 36884e8..d7921de 100644
--- a/library/Director/PropertyModifier/PropertyModifierGetHostByName.php
+++ b/library/Director/PropertyModifier/PropertyModifierGetHostByName.php
@@ -34,7 +34,8 @@ class PropertyModifierGetHostByName extends PropertyModifierHook
         }
 
         $host = gethostbyname($value);
-        if (strlen(@inet_pton($host)) !== 4) {
+        $inAddr = inet_pton($host);
+        if (! $inAddr || strlen($inAddr) !== 4) {
             switch ($this->getSetting('on_failure')) {
                 case 'null':
                     return null;