bug #36993 [ErrorHandler] fix setting $trace to null in FatalError (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 0d2bc7bd6a2e · 2020-05-28T14:15:08.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [ErrorHandler] fix setting $trace to null in FatalError | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Spotted by @nikic in php/php-src#5620 (comment) Commits ------- aa50c92 [ErrorHandler] fix setting $trace to null in FatalError
diff --git a/src/Symfony/Component/ErrorHandler/Error/FatalError.php b/src/Symfony/Component/ErrorHandler/Error/FatalError.php
@@ -72,9 +72,11 @@ public function __construct(string $message, int $code, array $error, int $trace
             'line' => $error['line'],
             'trace' => $trace,
         ] as $property => $value) {
-            $refl = new \ReflectionProperty(\Error::class, $property);
-            $refl->setAccessible(true);
-            $refl->setValue($this, $value);
+            if (null !== $value) {
+                $refl = new \ReflectionProperty(\Error::class, $property);
+                $refl->setAccessible(true);
+                $refl->setValue($this, $value);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,11 @@ public function __construct(string $message, int $code, array $error, int $trace`
`72`	`72`	`'line' => $error['line'],`
`73`	`73`	`'trace' => $trace,`
`74`	`74`	`] as $property => $value) {`
`75`		`- $refl = new \ReflectionProperty(\Error::class, $property);`
`76`		`- $refl->setAccessible(true);`
`77`		`- $refl->setValue($this, $value);`
	`75`	`+ if (null !== $value) {`
	`76`	`+ $refl = new \ReflectionProperty(\Error::class, $property);`
	`77`	`+ $refl->setAccessible(true);`
	`78`	`+ $refl->setValue($this, $value);`
	`79`	`+ }`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`