mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1416657 - Avoid calling IsThirdPartyChannel() with a nullptr channel in nsCookieService, r=Ehsan 

Differential Revision: https://phabricator.services.mozilla.com/D32672

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrea Marchesini 2019-05-27 13:25:12 +00:00
Родитель fa14c5eccf
Коммит c355651b11
1 изменённых файлов: 12 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
netwerk/cookie/nsCookieService.cpp
Просмотреть файл

@ -1970,7 +1970,10 @@ nsresult nsCookieService::GetCookieStringCommon(nsIURI* aHostURI,
// Determine whether the request is foreign. Failure is acceptable.
bool isForeign = true;
mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeign);
if (aChannel) {
mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeign);
}
bool isTrackingResource = false;
bool firstPartyStorageAccessGranted = false;
@ -2092,7 +2095,10 @@ nsresult nsCookieService::SetCookieStringCommon(nsIURI* aHostURI,
// Determine whether the request is foreign. Failure is acceptable.
bool isForeign = true;
mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeign);
if (aChannel) {
mThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isForeign);
}
bool isTrackingResource = false;
bool firstPartyStorageAccessGranted = false;
@ -3275,7 +3281,10 @@ bool nsCookieService::CanSetCookie(nsIURI* aHostURI, const nsCookieKey& aKey,
// 7 (111) = third-party and "https:" with Secure cookie flag
if (aThirdPartyUtil) {
bool isThirdParty = true;
aThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isThirdParty);
if (aChannel) {
aThirdPartyUtil->IsThirdPartyChannel(aChannel, aHostURI, &isThirdParty);
}
Telemetry::Accumulate(Telemetry::COOKIE_SCHEME_HTTPS,
(isThirdParty ? 0x04 : 0x00) |
(isHTTPS ? 0x02 : 0x00) |