From cb1348231a2378ff8af5e69c93e81bf3089bb52f Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Fri, 24 Mar 2017 09:57:35 +0100
Subject: [PATCH] [Console] Escape exception messages

---
 src/Symfony/Component/Console/Application.php  |  3 ++-
 .../Fixtures/application_renderexception3.txt  | 16 ++++++++--------
 .../application_renderexception3decorated.txt  | 18 +++++++++---------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index a9351a5897..32bd8373db 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -13,6 +13,7 @@ namespace Symfony\Component\Console;
 
 use Symfony\Component\Console\Descriptor\TextDescriptor;
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -651,7 +652,7 @@ class Application
             }
             $formatter = $output->getFormatter();
             $lines = array();
-            foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
+            foreach (preg_split('/\r?\n/', OutputFormatter::escape($e->getMessage())) as $line) {
                 foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
                     // pre-format lines to get the right string length
                     $lineLength = $this->stringWidth(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
index 8276137bd8..f41925f52a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt
@@ -1,13 +1,13 @@
 
-                           
-  [Exception]              
-  Third exception comment  
-                           
+                                              
+  [Exception]                                 
+  Third exception <fg=blue;bg=red>comment</>  
+                                              
 
-                            
-  [Exception]               
-  Second exception comment  
-                            
+                                               
+  [Exception]                                  
+  Second exception <comment>comment</comment>  
+                                               
 
                                        
   [Exception]                          
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
index b4a7b018af..5adccdd702 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt
@@ -1,17 +1,17 @@
 
-                           
-  [Exception]              
-  Third exception comment  
-                           
+                                              
+  [Exception]                                 
+  Third exception <fg=blue;bg=red>comment</>  
+                                              
 
-                            
-  [Exception]               
-  Second exception comment  
-                            
+                                               
+  [Exception]                                  
+  Second exception <comment>comment</comment>  
+                                               
 
                                        
   [Exception]                          
-  First exception <p>this is html</p>  
+  First exception <p>this is html</p>  
                                        
 
 foo3:bar