Merge pull request #18450 from Snuffleupagus/AppOptions-set-validation

Add more validation when setting `AppOptions` (PR 18413 follow-up)

web/app_options.js

@@ -511,29 +511,30 @@ class AppOptions {
   }
 
   static set(name, value) {
+    const defaultOption = defaultOptions[name];
+
+    if (!defaultOption || typeof value !== typeof defaultOption.value) {
+      return;
+    }
     userOptions[name] = value;
   }
 
   static setAll(options, prefs = false) {
     let events;
 
     for (const name in options) {
-      const userOption = options[name];
+      const defaultOption = defaultOptions[name],
+        userOption = options[name];
 
+      if (!defaultOption || typeof userOption !== typeof defaultOption.value) {
+        continue;
+      }
       if (prefs) {
-        const defaultOption = defaultOptions[name];
-
-        if (!defaultOption) {
-          continue;
-        }
-        const { kind, value } = defaultOption;
+        const { kind } = defaultOption;
 
         if (!(kind & OptionKind.BROWSER || kind & OptionKind.PREFERENCE)) {
           continue;
         }
-        if (typeof userOption !== typeof value) {
-          continue;
-        }
         if (this.eventBus && kind & OptionKind.EVENT_DISPATCH) {
           (events ||= new Map()).set(name, userOption);
         }