Pier Angelo Vendrame pushed to branch tor-browser-128.0esr-14.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
3599a60b
by Beatriz Rizental at 2024-07-30T11:15:51+02:00
3 changed files:
- dom/base/nsGlobalWindowOuter.cpp
- dom/security/nsContentSecurityUtils.cpp
- modules/libpref/Preferences.cpp
Changes:
| ... | ... | @@ -7300,7 +7300,7 @@ void nsGlobalWindowOuter::InitWasOffline() { mWasOffline = NS_IsOffline(); } |
| 7300 | 7300 | |
| 7301 | 7301 | #if defined(_WINDOWS_) && !defined(MOZ_WRAPPED_WINDOWS_H)
|
| 7302 | 7302 | # pragma message( \
|
| 7303 | - "wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
|
| 7303 | + "wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
|
| 7304 | 7304 | # error "Never include unwrapped windows.h in this file!"
|
| 7305 | 7305 | #endif
|
| 7306 | 7306 |
| ... | ... | @@ -1335,20 +1335,20 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) { |
| 1335 | 1335 | // This allowlist contains about: pages that are permanently allowed to
|
| 1336 | 1336 | // render without a CSP applied.
|
| 1337 | 1337 | static nsLiteralCString sAllowedAboutPagesWithNoCSP[] = {
|
| 1338 | - // about:blank is a special about page -> no CSP
|
|
| 1339 | - "about:blank"_ns,
|
|
| 1340 | - // about:srcdoc is a special about page -> no CSP
|
|
| 1341 | - "about:srcdoc"_ns,
|
|
| 1342 | - // about:sync-log displays plain text only -> no CSP
|
|
| 1343 | - "about:sync-log"_ns,
|
|
| 1344 | - // about:logo just displays the firefox logo -> no CSP
|
|
| 1345 | - "about:logo"_ns,
|
|
| 1346 | - // about:sync is a special mozilla-signed developer addon with low usage
|
|
| 1347 | - // ->
|
|
| 1348 | - // no CSP
|
|
| 1349 | - "about:sync"_ns,
|
|
| 1338 | + // about:blank is a special about page -> no CSP
|
|
| 1339 | + "about:blank"_ns,
|
|
| 1340 | + // about:srcdoc is a special about page -> no CSP
|
|
| 1341 | + "about:srcdoc"_ns,
|
|
| 1342 | + // about:sync-log displays plain text only -> no CSP
|
|
| 1343 | + "about:sync-log"_ns,
|
|
| 1344 | + // about:logo just displays the firefox logo -> no CSP
|
|
| 1345 | + "about:logo"_ns,
|
|
| 1346 | + // about:sync is a special mozilla-signed developer addon with low usage
|
|
| 1347 | + // ->
|
|
| 1348 | + // no CSP
|
|
| 1349 | + "about:sync"_ns,
|
|
| 1350 | 1350 | # if defined(ANDROID)
|
| 1351 | - "about:config"_ns,
|
|
| 1351 | + "about:config"_ns,
|
|
| 1352 | 1352 | # endif
|
| 1353 | 1353 | };
|
| 1354 | 1354 |
| ... | ... | @@ -6100,8 +6100,7 @@ void UnloadPrefsModule() { Preferences::Shutdown(); } |
| 6100 | 6100 | |
| 6101 | 6101 | // Preference Sanitization Related Code ---------------------------------------
|
| 6102 | 6102 | |
| 6103 | -#define PREF_LIST_ENTRY(s) \
|
|
| 6104 | - { s, (sizeof(s) / sizeof(char)) - 1 }
|
|
| 6103 | +#define PREF_LIST_ENTRY(s) {s, (sizeof(s) / sizeof(char)) - 1}
|
|
| 6105 | 6104 | struct PrefListEntry {
|
| 6106 | 6105 | const char* mPrefBranch;
|
| 6107 | 6106 | size_t mLen;
|