Catch exceptions to restore the error handler

GromNaN · GromNaN · commit 6e8c7fc64bcd · 2014-09-15T22:52:33.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -106,9 +106,15 @@ public function setData($data = array())
             }
         });
 
-        $this->data = json_encode($data, $this->encodingOptions);
+        try {
+            $this->data = json_encode($data, $this->encodingOptions);
 
-        restore_error_handler();
+            restore_error_handler();
+        } catch (\Exception $exception) {
+            restore_error_handler();
+
+            throw $exception;
+        }
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new \InvalidArgumentException($this->transformJsonError());
