From c46f3d37b1e8413ff8b97eccf314ec9e098f0acc Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Fri, 19 Jun 2020 18:46:49 -0400
Subject: [PATCH] Browser: Check for expired entry prior to custom data

* Fixes #4881
---
 src/browser/BrowserService.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 73a72f687..f90a91f98 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -847,13 +847,14 @@ QJsonObject BrowserService::prepareEntry(const Entry* entry)
 BrowserService::Access
 BrowserService::checkAccess(const Entry* entry, const QString& host, const QString& submitHost, const QString& realm)
 {
+    if (entry->isExpired()) {
+        return browserSettings()->allowExpiredCredentials() ? Allowed : Denied;
+    }
+
     BrowserEntryConfig config;
     if (!config.load(entry)) {
         return Unknown;
     }
-    if (entry->isExpired()) {
-        return browserSettings()->allowExpiredCredentials() ? Allowed : Denied;
-    }
     if ((config.isAllowed(host)) && (submitHost.isEmpty() || config.isAllowed(submitHost))) {
         return Allowed;
     }