MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [eventReport:getProxyElement] Prevent crash if viewing a report for an extended event 

- Make sure merging array happens in existing keys
pull/6916/head
mokaddem 2021-01-22 14:13:06 +01:00
parent 7e71489d1c
commit 8131ad86e3
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/Event.php
View File

@ -2469,6 +2469,12 @@ class Event extends AppModel
$event['Event']['extensionEvents'][$eventMeta['id']] = $eventMeta;
$thingsToMerge = array('Attribute', 'Object', 'ShadowAttribute', 'Galaxy');
foreach ($thingsToMerge as $thingToMerge) {
if (!isset($event[$thingToMerge])) {
$event[$thingToMerge] = [];
}
if (!isset($extensionEvent[$thingToMerge])) {
$extensionEvent[$thingToMerge] = [];
}
$event[$thingToMerge] = array_merge($event[$thingToMerge], $extensionEvent[$thingToMerge]);
}
// Merge event reports if requested