Merge branch 'hotfix/7513' into develop

Forward port zendframework#7513
Maks3w · May 11, 2015 · 7eb0eeb · 7eb0eeb
2 parents 90e0b3e + 3dd91dc
commit 7eb0eeb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php
@@ -197,7 +197,7 @@ private static function valueFromLdap($value)
             } else {
                 return $return;
             }
-        } catch (Exception\InvalidArgumentException $e) {
+        } catch (Converter\Exception\InvalidArgumentException $e) {
             return $value;
         }
     }

diff --git a/library/Zend/Ldap/Converter/Converter.php b/library/Zend/Ldap/Converter/Converter.php
@@ -339,7 +339,15 @@ public static function fromLdapDateTime($date, $asUtc = true)
                       . $time['offdir']
                       . str_pad($time['offsethours'], 2, '0', STR_PAD_LEFT)
                       . str_pad($time['offsetminutes'], 2, '0', STR_PAD_LEFT);
-        $date       = new DateTime($timestring);
+        try {
+            $date = new DateTime($timestring);
+        } catch (\Exception $e) {
+            throw new Exception\InvalidArgumentException(
+                'Invalid date format found',
+                0,
+                $e
+            );
+        }
         if ($asUtc) {
             $date->setTimezone(new DateTimeZone('UTC'));
         }

diff --git a/tests/ZendTest/Ldap/AttributeTest.php b/tests/ZendTest/Ldap/AttributeTest.php
@@ -51,6 +51,14 @@ public function testGetNonExistentAttributeValue()
         $this->assertNull($value);
     }
 
+    public function testInvalidValue()
+    {
+        $data  = array('uid' => array('45678+'));
+        $value = Attribute::getAttribute($data, 'uid', 0);
+
+        $this->assertEquals('45678+', $value);
+    }
+
     public function testGetNonExistentAttribute()
     {
         $data  = array('uid' => array('value'));