diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
| commit | 8240fb9c736f91044cabbdde8c537b179fc4921e (patch) | |
| tree | 49a4cc8dc683cf955d61b6618ad471860554ccb5 /extensions | |
| parent | f9e04b54c2ccbc1f8e24b511003de09b4565193c (diff) | |
| parent | 5c83a18cde404b5c0c9fba1d35f003d951ea32e2 (diff) | |
| download | UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.gz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.lz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.xz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/cookie/nsPermissionManager.cpp | 6 | ||||
| -rw-r--r-- | extensions/spellcheck/src/mozEnglishWordUtils.cpp | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index 13ae7fd35..2c2e2d79c 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -1076,8 +1076,6 @@ nsPermissionManager::InitDB(bool aRemoveFile) bool hostsTableExists = false; mDBConn->TableExists(NS_LITERAL_CSTRING("moz_hosts"), &hostsTableExists); if (hostsTableExists) { - bool migrationError = false; - // Both versions 4 and 6 have a version 4 formatted hosts table named // moz_hosts. We can migrate this table to our version 7 table moz_perms. // If moz_perms is present, then we can use it as a basis for comparison. @@ -1125,12 +1123,10 @@ nsPermissionManager::InitDB(bool aRemoveFile) // Read in the old row rv = stmt->GetUTF8String(0, host); if (NS_WARN_IF(NS_FAILED(rv))) { - migrationError = true; continue; } rv = stmt->GetUTF8String(1, type); if (NS_WARN_IF(NS_FAILED(rv))) { - migrationError = true; continue; } permission = stmt->AsInt32(2); @@ -1138,7 +1134,6 @@ nsPermissionManager::InitDB(bool aRemoveFile) expireTime = stmt->AsInt64(4); modificationTime = stmt->AsInt64(5); if (NS_WARN_IF(stmt->AsInt64(6) < 0)) { - migrationError = true; continue; } appId = static_cast<uint32_t>(stmt->AsInt64(6)); @@ -1155,7 +1150,6 @@ nsPermissionManager::InitDB(bool aRemoveFile) if (NS_FAILED(rv)) { NS_WARNING("Unexpected failure when upgrading migrating permission " "from host to origin"); - migrationError = true; } } diff --git a/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/extensions/spellcheck/src/mozEnglishWordUtils.cpp index 5033b247b..671b22c16 100644 --- a/extensions/spellcheck/src/mozEnglishWordUtils.cpp +++ b/extensions/spellcheck/src/mozEnglishWordUtils.cpp @@ -165,7 +165,7 @@ NS_IMETHODIMP mozEnglishWordUtils::FindNextWord(const char16_t *word, uint32_t l // before we spend more time looking to see if the word is a url, look for a url identifer // and make sure that identifer isn't the last character in the word fragment. - if ( (*p == ':' || *p == '@' || *p == '.') && p < endbuf - 1) { + if ( (p < endbuf - 1) && (*p == ':' || *p == '@' || *p == '.') ) { // ok, we have a possible url...do more research to find out if we really have one // and determine the length of the url so we can skip over it. |