diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-09 22:35:03 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-11 13:46:18 +0100 |
| commit | 38b00414148f4b013499b759ba3cd6cb72a15179 (patch) | |
| tree | 164797490b3a541b1c4c67e79e04a73cf1c5cdb6 | |
| parent | d62795c868dff9a12a8868d09b3331cb8c4ad39b (diff) | |
| download | UXP-38b00414148f4b013499b759ba3cd6cb72a15179.tar UXP-38b00414148f4b013499b759ba3cd6cb72a15179.tar.gz UXP-38b00414148f4b013499b759ba3cd6cb72a15179.tar.lz UXP-38b00414148f4b013499b759ba3cd6cb72a15179.tar.xz UXP-38b00414148f4b013499b759ba3cd6cb72a15179.zip | |
Handle missing base64 challenge in NegotiateAuth and NTLMAuth.
| -rw-r--r-- | extensions/auth/nsHttpNegotiateAuth.cpp | 5 | ||||
| -rw-r--r-- | netwerk/protocol/http/nsHttpNTLMAuth.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index adea54b85..8b6be915e 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -530,8 +530,11 @@ nsHttpNegotiateAuth::GenerateCredentials(nsIHttpAuthenticableChannel *authChanne challenge++; len = strlen(challenge); + if (!len)
+ return NS_ERROR_UNEXPECTED;
+ // strip off any padding (see bug 230351) - while (challenge[len - 1] == '=') + while (len && challenge[len - 1] == '=') len--; // diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index aa5b1f8f7..86bfcf4d1 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -486,8 +486,8 @@ nsHttpNTLMAuth::GenerateCredentials(nsIHttpAuthenticableChannel *authChannel, len -= 5; // strip off any padding (see bug 230351) - while (challenge[len - 1] == '=') - len--; + while (len && challenge[len - 1] == '=') + len--; // decode into the input secbuffer rv = Base64Decode(challenge, len, (char**)&inBuf, &inBufLen); |