diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2018-04-16 08:31:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 08:31:05 -0400 |
| commit | 4028f58ce7e9ed54327afc6e2a44f5092005dcda (patch) | |
| tree | a6123133b2347a723ecf1f99260c0738a369a97e /netwerk/base/nsStandardURL.cpp | |
| parent | c394a5f8710e9e83e8caa3f524aca4a80309b7cb (diff) | |
| parent | f138ec95d9d2c9faba019e52467beeed2a73b4f5 (diff) | |
| download | UXP-4028f58ce7e9ed54327afc6e2a44f5092005dcda.tar UXP-4028f58ce7e9ed54327afc6e2a44f5092005dcda.tar.gz UXP-4028f58ce7e9ed54327afc6e2a44f5092005dcda.tar.lz UXP-4028f58ce7e9ed54327afc6e2a44f5092005dcda.tar.xz UXP-4028f58ce7e9ed54327afc6e2a44f5092005dcda.zip | |
Merge pull request #175 from janekptacijarabaci/url_parser_2
moebius#131: URL parser - stop preserving empty passwords
Diffstat (limited to 'netwerk/base/nsStandardURL.cpp')
| -rw-r--r-- | netwerk/base/nsStandardURL.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp index 983e938ca..21c4cf7fd 100644 --- a/netwerk/base/nsStandardURL.cpp +++ b/netwerk/base/nsStandardURL.cpp @@ -781,11 +781,13 @@ nsStandardURL::BuildNormalizedSpec(const char *spec) i = AppendSegmentToBuf(buf, i, spec, username, mUsername, &encUsername, useEncUsername, &diff); ShiftFromPassword(diff); - if (password.mLen >= 0) { + if (password.mLen > 0) { buf[i++] = ':'; i = AppendSegmentToBuf(buf, i, spec, password, mPassword, &encPassword, useEncPassword, &diff); ShiftFromHost(diff); + } else { + mPassword.mLen = -1; } buf[i++] = '@'; } @@ -1621,7 +1623,7 @@ nsStandardURL::SetUserPass(const nsACString &input) usernameLen), esc_Username | esc_AlwaysCopy, buf, ignoredOut); - if (passwordLen >= 0) { + if (passwordLen > 0) { buf.Append(':'); passwordLen = encoder.EncodeSegmentCount(userpass.get(), URLSegment(passwordPos, @@ -1629,6 +1631,8 @@ nsStandardURL::SetUserPass(const nsACString &input) esc_Password | esc_AlwaysCopy, buf, ignoredOut); + } else { + passwordLen = -1; } if (mUsername.mLen < 0) buf.Append('@'); @@ -1659,8 +1663,10 @@ nsStandardURL::SetUserPass(const nsACString &input) // update positions and lengths mUsername.mLen = usernameLen; mPassword.mLen = passwordLen; - if (passwordLen) + if (passwordLen > 0) { mPassword.mPos = mUsername.mPos + mUsername.mLen + 1; + } + return NS_OK; } |