diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-07 12:03:46 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-07 12:03:46 +0100 |
| commit | f8d1830b530cd553d788b3579d41725d35c4da7f (patch) | |
| tree | c995f1eed357cbeb7ed9bbe9d2319ca802b77a26 /dom/base/nsContentUtils.cpp | |
| parent | 0f3e990615adfd42ae9cfbe13a6259cb6a0368c4 (diff) | |
| parent | e9f79ad46582ca150ef193252851015a031d1556 (diff) | |
| download | UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar.gz UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar.lz UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.tar.xz UXP-f8d1830b530cd553d788b3579d41725d35c4da7f.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'dom/base/nsContentUtils.cpp')
| -rw-r--r-- | dom/base/nsContentUtils.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 29d28f8ce..1cc352685 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -4128,9 +4128,15 @@ nsContentUtils::GetSubdocumentWithOuterWindowId(nsIDocument *aDocument, /* static */ nsresult nsContentUtils::ConvertStringFromEncoding(const nsACString& aEncoding, - const nsACString& aInput, + const char* aInput, + uint32_t aInputLen, nsAString& aOutput) { + CheckedInt32 len = aInputLen; + if (!len.isValid()) { + return NS_ERROR_OUT_OF_MEMORY; + } + nsAutoCString encoding; if (aEncoding.IsEmpty()) { encoding.AssignLiteral("UTF-8"); @@ -4142,7 +4148,7 @@ nsContentUtils::ConvertStringFromEncoding(const nsACString& aEncoding, nsAutoPtr<TextDecoder> decoder(new TextDecoder()); decoder->InitWithEncoding(encoding, false); - decoder->Decode(aInput.BeginReading(), aInput.Length(), false, + decoder->Decode(aInput, len.value(), false, aOutput, rv); return rv.StealNSResult(); } |