symfony
diff --git a/‎src/Symfony/Component/Debug/Exception/FlattenException.php
Lines changed: 5 additions & 2 deletions b/‎src/Symfony/Component/Debug/Exception/FlattenException.php
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
Lines changed: 22 additions & 0 deletions b/‎src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
Lines changed: 22 additions & 0 deletions
@@ -239,17 +239,20 @@ public function setTrace($trace, $file, $line)
         }
     }
 
-    private function flattenArgs($args, $level = 0)
+    private function flattenArgs($args, $level = 0, &$count = 0)
     {
         $result = array();
         foreach ($args as $key => $value) {
+            if (++$count > 1e4) {
+                return array('array', '*SKIPPED over 10000 entries*');
+            }
             if (is_object($value)) {
                 $result[$key] = array('object', get_class($value));
             } elseif (is_array($value)) {
                 if ($level > 10) {
                     $result[$key] = array('array', '*DEEP NESTED ARRAY*');
                 } else {
-                    $result[$key] = array('array', $this->flattenArgs($value, $level + 1));
+                    $result[$key] = array('array', $this->flattenArgs($value, $level + 1, $count));
                 }
             } elseif (null === $value) {
                 $result[$key] = array('null', null);
 
@@ -186,6 +186,28 @@ public function testRecursionInArguments()
         $this->assertContains('*DEEP NESTED ARRAY*', serialize($trace));
     }
 
+    public function testTooBigArray()
+    {
+        $a = array();
+        for ($i = 0; $i < 20; $i++) {
+            for ($j = 0; $j < 50; $j++) {
+                for ($k = 0; $k < 10; $k++) {
+                    $a[$i][$j][$k] = 'value';
+                }
+            }
+        }
+        $a[20] = 'value';
+        $a[21] = 'value1';
+        $exception = $this->createException($a);
+
+        $flattened = FlattenException::create($exception);
+        $trace = $flattened->getTrace();
+        $serialize_trace = serialize($trace);
+
+        $this->assertContains('*SKIPPED over 10000 entries*', $serialize_trace);
+        $this->assertNotContains('*value1*', $serialize_trace);
+    }
+
     private function createException($foo)
     {
         return new \Exception();
Original file line number	Diff line number	Diff line change
`@@ -239,17 +239,20 @@ public function setTrace($trace, $file, $line)`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`
`242`		`- private function flattenArgs($args, $level = 0)`
	`242`	`+ private function flattenArgs($args, $level = 0, &$count = 0)`
`243`	`243`	`{`
`244`	`244`	`$result = array();`
`245`	`245`	`foreach ($args as $key => $value) {`
	`246`	`+ if (++$count > 1e4) {`
	`247`	`+ return array('array', 'SKIPPED over 10000 entries');`
	`248`	`+ }`
`246`	`249`	`if (is_object($value)) {`
`247`	`250`	`$result[$key] = array('object', get_class($value));`
`248`	`251`	`} elseif (is_array($value)) {`
`249`	`252`	`if ($level > 10) {`
`250`	`253`	`$result[$key] = array('array', 'DEEP NESTED ARRAY');`
`251`	`254`	`} else {`
`252`		`- $result[$key] = array('array', $this->flattenArgs($value, $level + 1));`
	`255`	`+ $result[$key] = array('array', $this->flattenArgs($value, $level + 1, $count));`
`253`	`256`	`}`
`254`	`257`	`} elseif (null === $value) {`
`255`	`258`	`$result[$key] = array('null', null);`