corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1433958 - Change code that sets nsIURI.userPass to use nsIURIMutator r=mayhemer

Browse Source 
* Code in XMLHttpRequestMainThread is converted to set the username and password individually. This is because when the parameters are empty, it ended up calling SetUserPass(":") which always returns an error.

MozReview-Commit-ID: 3cK5HeyzjFE
This commit is contained in:
Valentin Gosu
2018-02-26 20:43:46 +01:00
parent d4f4bcfafd
commit b9160f5ce8
17 changed files with 79 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
View File

@@ -6,6 +6,7 @@
#include "nsEscape.h"
#include "nsString.h"
#include "nsIURI.h"
#include "nsIURIMutator.h"
#include "nsIURL.h"
#include "nsUrlClassifierUtils.h"
#include "nsTArray.h"
@@ -479,21 +480,17 @@ GetSpecWithoutSensitiveData(nsIURI* aUri, nsACString &aSpec)
return NS_ERROR_INVALID_ARG;
}
nsCOMPtr<nsIURI> clone;
// Clone to make the uri mutable
nsresult rv = aUri->CloneIgnoringRef(getter_AddRefs(clone));
nsCOMPtr<nsIURL> url(do_QueryInterface(clone));
nsresult rv;
nsCOMPtr<nsIURL> url(do_QueryInterface(aUri));
if (url) {
rv = url->SetQuery(EmptyCString());
nsCOMPtr<nsIURI> clone;
rv = NS_MutateURI(url)
.SetQuery(EmptyCString())
.SetRef(EmptyCString())
.SetUserPass(EmptyCString())
.Finalize(clone);
NS_ENSURE_SUCCESS(rv, rv);
rv = url->SetRef(EmptyCString());
NS_ENSURE_SUCCESS(rv, rv);
rv = url->SetUserPass(EmptyCString());
NS_ENSURE_SUCCESS(rv, rv);
rv = url->GetAsciiSpec(aSpec);
rv = clone->GetAsciiSpec(aSpec);
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_OK;