From 1768eb1930a63c40316f8febb9276ef423d08ee2 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 18 May 2023 14:13:23 +0200
Subject: [PATCH] [Pale-Moon] Issue #1925 - Follow-up: Throw errors on invalid
 values.

Uses defaults for negative values and caps upper limit.
---
 application/palemoon/base/content/browser-places.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/palemoon/base/content/browser-places.js b/application/palemoon/base/content/browser-places.js
index c861c41607..f58b4118e3 100644
--- a/application/palemoon/base/content/browser-places.js
+++ b/application/palemoon/base/content/browser-places.js
@@ -505,15 +505,21 @@ function HistoryMenu(aPopupShowingEvent) {
                                      "@mozilla.org/browser/sessionstore;1",
                                      "nsISessionStore");
   let maxResults = Services.prefs.getIntPref("browser.history.menuMaxResults", 15);
-  // Workaround so that maxResults = 0 wouldn't create unlimited items
+  if (maxResults < 0) {
+    Components.utils.reportError("Maximum number of history menu entries is invalid! Using defaults.");
+    maxResults = 15;
+  }
   if (maxResults > 0) {
     if (maxResults > 50) {
       // Return to sanity...
-      maxResults = 15;
+      Components.utils.reportError("Maximum number of history menu entries is too large! Capping to 50.");
+      maxResults = 50;
     }
     PlacesMenu.call(this, aPopupShowingEvent,
                     "place:sort=4&maxResults=" + maxResults.toString().trim());
-  }
+  } else {
+    // maxResults == 0; do nothing. This suppresses the history entries.
+  }  
 }
 
 HistoryMenu.prototype = {