Skip to content

Commit 870c26f

Browse files
[VarDumper] Add missing isset() checks in some casters
1 parent 25a2ce0 commit 870c26f

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php

+14-10
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ public static function castThrowingCasterException(ThrowingCasterException $e, a
6767

6868
if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) {
6969
$b = (array) $a[$xPrefix.'previous'];
70-
array_unshift($b[$xPrefix.'trace'], array(
71-
'function' => 'new '.get_class($a[$xPrefix.'previous']),
72-
'file' => $b[$prefix.'file'],
73-
'line' => $b[$prefix.'line'],
74-
));
70+
if (isset($a[$prefix.'file'], $a[$prefix.'line'])) {
71+
array_unshift($b[$xPrefix.'trace'], array(
72+
'function' => 'new '.get_class($a[$xPrefix.'previous']),
73+
'file' => $b[$prefix.'file'],
74+
'line' => $b[$prefix.'line'],
75+
));
76+
}
7577
$a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value));
7678
}
7779

@@ -234,11 +236,13 @@ private static function filterExceptionArray($xClass, array $a, $xPrefix, $filte
234236
}
235237

236238
if (!($filter & Caster::EXCLUDE_VERBOSE)) {
237-
array_unshift($trace, array(
238-
'function' => $xClass ? 'new '.$xClass : null,
239-
'file' => $a[Caster::PREFIX_PROTECTED.'file'],
240-
'line' => $a[Caster::PREFIX_PROTECTED.'line'],
241-
));
239+
if (isset($a[Caster::PREFIX_PROTECTED.'file'], $a[Caster::PREFIX_PROTECTED.'line'])) {
240+
array_unshift($trace, array(
241+
'function' => $xClass ? 'new '.$xClass : null,
242+
'file' => $a[Caster::PREFIX_PROTECTED.'file'],
243+
'line' => $a[Caster::PREFIX_PROTECTED.'line'],
244+
));
245+
}
242246
$a[$xPrefix.'trace'] = new TraceStub($trace, self::$traceArgs);
243247
}
244248
if (empty($a[$xPrefix.'previous'])) {

0 commit comments

Comments
 (0)