From 8c7e1338ced4de4fb701bcbfe568faa20518a3db Mon Sep 17 00:00:00 2001 From: roytam1 Date: Mon, 6 Jun 2022 08:53:49 +0800 Subject: [PATCH] Revert "Issue #1909 - Guard against empty update manifest URL" This reverts commit 7b3f9fb7c08b2da84f69c9dcb0c99ccfaf65679e. --- .../mozapps/extensions/internal/AddonUpdateChecker.jsm | 8 -------- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm index 6710c6a70f..a475f7f1fa 100644 --- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm +++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm @@ -611,14 +611,6 @@ function UpdateParser(aId, aUpdateKey, aUrl, aObserver) { let requireBuiltIn = Services.prefs.getBoolPref(PREF_UPDATE_REQUIREBUILTINCERTS, true); logger.debug("Requesting " + aUrl); - - if (!aUrl) { - logger.warn("Request failed: empty update manifest URL"); - this._doneAt = new Error("UP_emptyManifestURL"); - this.notifyError(AddonUpdateChecker.ERROR_DOWNLOAD_ERROR); - return; - } - try { this.request = new ServiceRequest(); this.request.open("GET", this.url, true); diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 8eb140f0c6..690351be1d 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -6135,11 +6135,7 @@ function UpdateChecker(aAddon, aListener, aReason, aAppVersion, aPlatformVersion if ("onUpdateAvailable" in this.listener) aReason |= UPDATE_TYPE_NEWVERSION; - // Don't perform substitutions on the update URL if we still don't - // have one at this point. - let url = updateURL ? - escapeAddonURI(aAddon, url, aReason, aAppVersion) : - updateURL; + let url = escapeAddonURI(aAddon, updateURL, aReason, aAppVersion); this._parser = AddonUpdateChecker.checkForUpdates(aAddon.id, aAddon.updateKey, url, this); }