From 409ff9361785d71e515ebae9b7f351d9309fce1d Mon Sep 17 00:00:00 2001 From: Ryan Pratt <44932063+ryan-pratt@users.noreply.github.com> Date: Mon, 13 Jan 2025 15:30:15 -0700 Subject: [PATCH 1/2] Fix code scanning alert no. 234: Prototype-polluting function Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> --- .../plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js | 1 + 1 file changed, 1 insertion(+) diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js index ed2ccaa955..b2dcb16a39 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js @@ -17,6 +17,7 @@ function isObject(item) { export default function merge(target, source) { if (isObject(target) && isObject(source)) { Object.keys(source).forEach((key) => { + if (key === "__proto__" || key === "constructor") return; if (isObject(source[key])) { if (!target[key] || !isObject(target[key])) { target[key] = source[key] From c46b698799942beb13fd00011959c61cc3624c03 Mon Sep 17 00:00:00 2001 From: Ryan Pratt Date: Mon, 13 Jan 2025 15:40:03 -0700 Subject: [PATCH 2/2] prettier autofix --- .../packages/openc3-cosmos-ace-diff/src/helpers/merge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js index b2dcb16a39..bb2ae4fddf 100644 --- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js +++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-ace-diff/src/helpers/merge.js @@ -17,7 +17,7 @@ function isObject(item) { export default function merge(target, source) { if (isObject(target) && isObject(source)) { Object.keys(source).forEach((key) => { - if (key === "__proto__" || key === "constructor") return; + if (key === '__proto__' || key === 'constructor') return if (isObject(source[key])) { if (!target[key] || !isObject(target[key])) { target[key] = source[key]