From ab6f062ff99c03738d8d3267c33e23524b25cf5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 22 Jun 2021 12:35:53 -0400
Subject: [PATCH] fix: prevent crash in expandObjBy #9618

---
 src/settings.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/settings.js b/src/settings.js
index 65fe24322a..87508b1dcb 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -5,6 +5,9 @@ const pubsub = require('./pubsub');
 
 function expandObjBy(obj1, obj2) {
 	let changed = false;
+	if (!obj1 || !obj2) {
+		return changed;
+	}
 	for (const [key, val2] of Object.entries(obj2)) {
 		const val1 = obj1[key];
 		const xorIsArray = Array.isArray(val1) !== Array.isArray(val2);