Bug 1649127 - Only trigger confirmation in TRR-first and TRR-only modes r=dragana,necko-reviewers

Due to a change in timing in this patch, when we reset the confirmation pref
at the end of the test, a TRR request would happen after we changed the prefs
leading to accessing a non-local IP in testing and causing a crash.
This should be gated on being in the correct mode anyway

Depends on D81517

Differential Revision: https://phabricator.services.mozilla.com/D82222
This commit is contained in:
Valentin Gosu 2020-07-04 13:08:30 +00:00
Родитель a38929f26f
Коммит acc4997769
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -277,7 +277,8 @@ nsresult TRRService::ReadPrefs(const char* name) {
nsAutoCString old(mConfirmationNS);
Preferences::GetCString(TRR_PREF("confirmationNS"), mConfirmationNS);
if (name && !old.IsEmpty() && !mConfirmationNS.Equals(old) &&
(mConfirmationState > CONFIRM_TRYING)) {
(mConfirmationState > CONFIRM_TRYING) &&
(mMode == MODE_TRRFIRST || mMode == MODE_TRRONLY)) {
LOG(("TRR::ReadPrefs: restart confirmationNS state\n"));
mConfirmationState = CONFIRM_TRYING;
MaybeConfirm_locked();