mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
4e6138a54f
- remove PM alertTime custom (911dd825ec) - Bug 1208346 - Alert service Do Not Disturb backend. r=jaws (0047051b4e) - Bug 1208346 - Fix manualDoNotDisturb build bustage on Android. r=bustage (39275a49bd) - Add some shadow warnings back (64eb2adf55) - some window fixes by Roy (72e6a9b98e) - remove parameter of DoesD3D11DeviceWork (243dfb24f4) - Bug 1197296. Check the error code of Map. r=bas (9debd274fd) - Bug 1221348 - Part 1: Unify crash signatures. r=jrmuizel (80763d326d) - Bug 1221348 - Part 2: Fix texture sharing detection code on Intel. r=jrmuizel (fb0390850d) - Bug 1097321 - Add layers.amd-switchable-gfx.enabled pref. r=jrmuizel (3963a35cbc) - Bug 720589 - mMatchCounts may be accessed with a nonexisting index. r=neil (fdbdd7e228) - Bug 1224975 - add telemetry for font loading. r=m_kato (013a6e8fc7) - Bug 1188376: Split Hello Telemetry values from general WebRTC r=jib (3887cc3201) - Bug 1198883 - Part 1: Improve ICE candidates telemetry probes. r=bwc (2d02a3d752) - Bug 1198883 - Part 2: Added WebRTC ICE candidates to Telemetry. r+vladan (fa8032043f) - Bug 1201926 - Add support for keyed histograms to Fennec's Telemetry module, r=nalexander (8b96ebf026) - Bug 1213780 - Fix Telemetry reporting repeated hang annotations for Chrome hangs. r=aklotz (afde812b08) - Bug 1128768: Part 4 - Update telemetry to serialize BHR hang annotations; r=gfritzsche (7c1b8f5fa5) - Bug 1215540 - Fix Telemetry reporting repeated hang annotations for Thread hangs. r=aklotz (afed35f06f) - Bug 896740 - Limit the number of chrome-hangs reported to Telemetry. r=vladan (a37ba72225) - missing bits of Bug 932865 - Expose thread hang stats (c19c41ae06) - Bug 1187138 (part 1) - Replace nsBaseHashtable::Enumerate() calls in toolkit/ with iterators. r=froydnj. (ba92a8464f) - Bug 1121040 - Don't send RETURN keypresses to content while a satchel autocomplete entry is selected. r=Gijs,smaug (762efd7cc8) - Bug 1145146 - Remove offensive comment from nsFormFillController r=mak (7a6b0eb4e1) - Bug 1136085 - Part 1 - Don't store & collect subsession histograms on mobile. r=vladan (911084001c) - missing bits of Bug 1023461 - Add HangStack class to support internal string buffer; r=vladan (599bee2150) - Bug 1196381 - Eliminate breakpad dependency in ThreadStackHelper; r=nfroyd r=snorp (ff8a632975) - fix misspatch of 1157282 and 1198883 (9a216ab188) - Bug 1034138 - a. Get native stack for permahangs in BHM; r=snorp (772970d0e0) - Bug 1211411 - Limit the number of thread hang stats reported to Telemetry. r=vladan (fd72bc8b62) - Bug 1219751 - Change the the depth limit of the thread hangs stack to use the 99th percentile. r=gfritzsche (fc59bd7598) - Bug 1133521 - Enable BHR on Beta. r=vladan (2501c6a0ff) - Bug 1219216 - Fix a wrong comment in BackgroundHangMonitor.h. r=gfritzsche (e974320361) - bits of Bug 1134279 - Change Telemetry data producers to use the correct (d00e84b7f3) - bits of Bug 977026 - Part 2: B2G loader (bf1208a73a) - bug 1198450 - Firefox fails to load about:home if Firefox was installed to a folder with non-Latin name r=jimm (c4df06a69e) - Bug 1222167 - fix initialization order in GeckoChildProcessHost; r=jld (6bad274479) - Bug 1141693 - Build and use a PIE plugin-container on Android 5.0+. Based on a patch by Mike Hommey. r=me,glandium (78dc877aec) - Bug 1187533 - Change how Gtk+2 plugin-container is started on Gtk+3 builds. r=billm (93c2b8a1b0) - Bug 1063359 - Unconditionally use -Wl,--no-as-needed when building with GNU ld/gold. r=mshal (643e92ca49) - Bug 971811 - Don't prepend an empty existing DYLD_INSERT_LIBRARIES path when launching the plugin. r=smichaud (c72df0073c) - Bug 1189352: Fix NSPR_LOG_FILE with absolute paths for sandboxed child on Windows. r=bbondy (f4bb51c123) - Bug 1189967 - Be slightly more explicit about some conversions to std::wstring. r=nfroyd (7bec611359) - Bug 1201438: Add non-sandboxed Windows content processes as target peers for handle duplication. r=bbondy (1ca7f499e9) - Bug 1201438 - Fixup for builds with disabled sandbox. (de125d156e) - Bug 1165895: Add NPAPI sandbox rule for the crash server pipe and x64 Temp dir write access. r=bbondy (e9f601912d) - Bug 1202988 - Don't use GetTempPath for flash's mms.cfg hack for low integrity. r=aklotz (b4a0d7f856) - Bug 1225023: Allow Flash Player to create Adobe\Flash Player and Macromedia\Flash Player directories. r=bbondy (c5120afc1d) - Bug 1218681 - add plugin-container standalone process code. The Code associate with ARCH. r=hev (03dfb21776) - bug 1130976 - Flash context menu causes CPOW deadlock with AdBlock Plus, plugins should spin even loop in content process instead of the chrome process r=billm (52f4d33633) - Bug 1157237: Move invocation of async NPP_New to an async task; r=jimm (7b6c1a577e) - Bug 1175147 - Don't do threadsafety asserts for NPN_MemAlloc and friends, r=jimm (b4ce5b33ce) - fix strange misspatch (8a96a61819) - Bug 1219244 - use UniquePtr instead of nsAutoArrayPtr in dom/plugins/; r=aklotz (19fabc55b5) - Bug 1155503: BrowserStreamParent should null out its NPStream pointer and we should check for it; r=jimm (eddb82b8b4) - some crashrep stuff (bb2b046090) - Bug 1192077 - Convert AndroidBridge JNIEnv calls; r=esawin (821453089e) - Bug 554171 - Add plugin thread checks to functions that must only be called on the main thread. r=jimm (f2eb3822da) - Bug 1149358: Ensure that plugin streams are not manipulated by PluginAsyncSurrogate if plugin destruction is imminent; r=jimm (6dd99c94ee) - Bug 1198302 - Ensure that PluginAsyncSurrogate::NotifyAsyncInitFailed properly aborts any PluginAsyncSurrogate::WaitForInit calls. r=jimm (23c1fbfcfe) - Bug 1201239 - Add a proper null check in PluginAsyncSurrogate::NotifyAsyncInitFailed; r=jimm (5d8ff9f8aa) - Bug 1208059: Make nsNPAPIPluginInstance support WeakPtr and modify PluginAsyncSurrogate to use it; r=jimm (174a3166b1) - Bug 1171453: Make ParentNPObjects aware of AsyncNPObject wrappers; r=jimm (92e608831d) - Bug 1217726 - Fix -Wimplicit-fallthrough warnings in dom/plugins. r=jimm (32db26ede8) - Bug 1167720 - Fix invalid window ID provided to GTK3 plugin container children. r=karlt (d8c2de0c19) - Remove Windows-specific synchronous plugin drawing code. (bug 1218688 part 1, r=jimm) (5e4b60ea33) - Remove Linux-specific synchronous plugin drawing code. (bug 1218688 part 2, r=jimm) (edb29f27b8) - Remove Mac-specific synchronous plugin drawing code. (bug 1218688 part 3, r=benwa) (acc6b57b23) - Assert that we do not attempt synchronous painting of windowless Desktop plugins. (bug 1218688 part 4, r=bsmedberg) (c34094b038) - Bug 1195472 - Call Show after Enable on puppet widgets to avoid an assertion when running crash tests. r=aklotz (405ed2c1d1) - Add explicit keyword to AsyncScrollBase constructor to fix static analysis build (bug 1139220 part 6, r=shu) (4cc37b9a3b) - Bug 1146561 - Add back the visibility check for Mac plugins. r=jmuizelaar (91a4a5a8e9) - namespace (9b4919f8fa) - Bug 1217307 - Remove some unnecessary null checks in rest of dom/. r=njn (de5d69880a) - Bug 1225137 - Avoid crash on some platforms if scrollbar fading is enabled and the duration is set to zero. r=spohl (a16954de2f) - Bug 1114554 - Disable NotificationStorage debug logging. r=dholbert (c2722fa4ed) - Bug 1073551 - fix doorhangers to not steal focus unless explicitly opened using mouse or keyboard, r=jaws (be6109cf6d) - Bug 1169629: Add-on install confirmation notification appears anchored to older dismissed anchors. r=dao (684535c7cc) - Bug 1194706: make sure that the notification icons and doorhangers are shown in undocked chat windows too. r=Mossop (68e0ced913) - Bug 1207089 - Telemetry for permission notifications. r=MattN,vladan (ff421236ea) - Bug 1215526 - part 4 - make preprocess-tab-svgs.py report extra dependencies; r=glandium (98b64b5c45)
658 lines
18 KiB
C++
658 lines
18 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "jsapi.h"
|
|
#include "js/CharacterEncoding.h"
|
|
#include "nsJSON.h"
|
|
#include "nsIXPConnect.h"
|
|
#include "nsIXPCScriptable.h"
|
|
#include "nsStreamUtils.h"
|
|
#include "nsIInputStream.h"
|
|
#include "nsStringStream.h"
|
|
#include "mozilla/dom/EncodingUtils.h"
|
|
#include "nsIUnicodeEncoder.h"
|
|
#include "nsIUnicodeDecoder.h"
|
|
#include "nsXPCOMStrings.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsIURI.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsContentUtils.h"
|
|
#include "nsIScriptError.h"
|
|
#include "nsCRTGlue.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsIScriptSecurityManager.h"
|
|
#include "nsNullPrincipal.h"
|
|
#include "mozilla/Maybe.h"
|
|
#include <algorithm>
|
|
|
|
using mozilla::dom::EncodingUtils;
|
|
|
|
#define JSON_STREAM_BUFSIZE 4096
|
|
|
|
NS_INTERFACE_MAP_BEGIN(nsJSON)
|
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIJSON)
|
|
NS_INTERFACE_MAP_ENTRY(nsIJSON)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_ADDREF(nsJSON)
|
|
NS_IMPL_RELEASE(nsJSON)
|
|
|
|
nsJSON::nsJSON()
|
|
{
|
|
}
|
|
|
|
nsJSON::~nsJSON()
|
|
{
|
|
}
|
|
|
|
enum DeprecationWarning { EncodeWarning, DecodeWarning };
|
|
|
|
static nsresult
|
|
WarnDeprecatedMethod(DeprecationWarning warning)
|
|
{
|
|
return nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
|
|
NS_LITERAL_CSTRING("DOM Core"), nullptr,
|
|
nsContentUtils::eDOM_PROPERTIES,
|
|
warning == EncodeWarning
|
|
? "nsIJSONEncodeDeprecatedWarning"
|
|
: "nsIJSONDecodeDeprecatedWarning");
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSON::Encode(JS::Handle<JS::Value> aValue, JSContext* cx, uint8_t aArgc,
|
|
nsAString &aJSON)
|
|
{
|
|
// This function should only be called from JS.
|
|
nsresult rv = WarnDeprecatedMethod(EncodeWarning);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
if (aArgc == 0) {
|
|
aJSON.Truncate();
|
|
aJSON.SetIsVoid(true);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsJSONWriter writer;
|
|
rv = EncodeInternal(cx, aValue, &writer);
|
|
|
|
// FIXME: bug 408838. Get exception types sorted out
|
|
if (NS_SUCCEEDED(rv) || rv == NS_ERROR_INVALID_ARG) {
|
|
rv = NS_OK;
|
|
// if we didn't consume anything, it's not JSON, so return null
|
|
if (!writer.DidWrite()) {
|
|
aJSON.Truncate();
|
|
aJSON.SetIsVoid(true);
|
|
} else {
|
|
writer.FlushBuffer();
|
|
aJSON.Append(writer.mOutputString);
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
static const char UTF8BOM[] = "\xEF\xBB\xBF";
|
|
static const char UTF16LEBOM[] = "\xFF\xFE";
|
|
static const char UTF16BEBOM[] = "\xFE\xFF";
|
|
|
|
static nsresult CheckCharset(const char* aCharset)
|
|
{
|
|
// Check that the charset is permissible
|
|
if (!(strcmp(aCharset, "UTF-8") == 0 ||
|
|
strcmp(aCharset, "UTF-16LE") == 0 ||
|
|
strcmp(aCharset, "UTF-16BE") == 0)) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSON::EncodeToStream(nsIOutputStream *aStream,
|
|
const char* aCharset,
|
|
const bool aWriteBOM,
|
|
JS::Handle<JS::Value> val,
|
|
JSContext* cx,
|
|
uint8_t aArgc)
|
|
{
|
|
// This function should only be called from JS.
|
|
NS_ENSURE_ARG(aStream);
|
|
nsresult rv;
|
|
|
|
rv = CheckCharset(aCharset);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// Check to see if we have a buffered stream
|
|
nsCOMPtr<nsIOutputStream> bufferedStream;
|
|
// FIXME: bug 408514.
|
|
// NS_OutputStreamIsBuffered(aStream) asserts on file streams...
|
|
//if (!NS_OutputStreamIsBuffered(aStream)) {
|
|
rv = NS_NewBufferedOutputStream(getter_AddRefs(bufferedStream),
|
|
aStream, 4096);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
// aStream = bufferedStream;
|
|
//}
|
|
|
|
uint32_t ignored;
|
|
if (aWriteBOM) {
|
|
if (strcmp(aCharset, "UTF-8") == 0)
|
|
rv = aStream->Write(UTF8BOM, 3, &ignored);
|
|
else if (strcmp(aCharset, "UTF-16LE") == 0)
|
|
rv = aStream->Write(UTF16LEBOM, 2, &ignored);
|
|
else if (strcmp(aCharset, "UTF-16BE") == 0)
|
|
rv = aStream->Write(UTF16BEBOM, 2, &ignored);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
nsJSONWriter writer(bufferedStream);
|
|
rv = writer.SetCharset(aCharset);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
if (aArgc == 0) {
|
|
return NS_OK;
|
|
}
|
|
|
|
rv = EncodeInternal(cx, val, &writer);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = bufferedStream->Flush();
|
|
|
|
return rv;
|
|
}
|
|
|
|
static bool
|
|
WriteCallback(const char16_t *buf, uint32_t len, void *data)
|
|
{
|
|
nsJSONWriter *writer = static_cast<nsJSONWriter*>(data);
|
|
nsresult rv = writer->Write((const char16_t*)buf, (uint32_t)len);
|
|
if (NS_FAILED(rv))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSON::EncodeFromJSVal(JS::Value *value, JSContext *cx, nsAString &result)
|
|
{
|
|
result.Truncate();
|
|
|
|
mozilla::Maybe<JSAutoCompartment> ac;
|
|
if (value->isObject()) {
|
|
JS::Rooted<JSObject*> obj(cx, &value->toObject());
|
|
ac.emplace(cx, obj);
|
|
}
|
|
|
|
nsJSONWriter writer;
|
|
JS::Rooted<JS::Value> vp(cx, *value);
|
|
if (!JS_Stringify(cx, &vp, nullptr, JS::NullHandleValue, WriteCallback, &writer)) {
|
|
return NS_ERROR_XPC_BAD_CONVERT_JS;
|
|
}
|
|
*value = vp;
|
|
|
|
NS_ENSURE_TRUE(writer.DidWrite(), NS_ERROR_UNEXPECTED);
|
|
writer.FlushBuffer();
|
|
result.Assign(writer.mOutputString);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsJSON::EncodeInternal(JSContext* cx, const JS::Value& aValue,
|
|
nsJSONWriter* writer)
|
|
{
|
|
// Backward compatibility:
|
|
// nsIJSON does not allow to serialize anything other than objects
|
|
if (!aValue.isObject()) {
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
JS::Rooted<JSObject*> obj(cx, &aValue.toObject());
|
|
|
|
/* Backward compatibility:
|
|
* Manually call toJSON if implemented by the object and check that
|
|
* the result is still an object
|
|
* Note: It is perfectly fine to not implement toJSON, so it is
|
|
* perfectly fine for GetMethod to fail
|
|
*/
|
|
JS::Rooted<JS::Value> val(cx, aValue);
|
|
JS::Rooted<JS::Value> toJSON(cx);
|
|
if (JS_GetProperty(cx, obj, "toJSON", &toJSON) &&
|
|
toJSON.isObject() && JS::IsCallable(&toJSON.toObject())) {
|
|
// If toJSON is implemented, it must not throw
|
|
if (!JS_CallFunctionValue(cx, obj, toJSON, JS::HandleValueArray::empty(), &val)) {
|
|
if (JS_IsExceptionPending(cx))
|
|
// passing NS_OK will throw the pending exception
|
|
return NS_OK;
|
|
|
|
// No exception, but still failed
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// Backward compatibility:
|
|
// nsIJSON does not allow to serialize anything other than objects
|
|
if (val.isPrimitive())
|
|
return NS_ERROR_INVALID_ARG;
|
|
}
|
|
// GetMethod may have thrown
|
|
else if (JS_IsExceptionPending(cx))
|
|
// passing NS_OK will throw the pending exception
|
|
return NS_OK;
|
|
|
|
// Backward compatibility:
|
|
// function shall not pass, just "plain" objects and arrays
|
|
JSType type = JS_TypeOfValue(cx, val);
|
|
if (type == JSTYPE_FUNCTION)
|
|
return NS_ERROR_INVALID_ARG;
|
|
|
|
// We're good now; try to stringify
|
|
if (!JS_Stringify(cx, &val, nullptr, JS::NullHandleValue, WriteCallback, writer))
|
|
return NS_ERROR_FAILURE;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
nsJSONWriter::nsJSONWriter() : mStream(nullptr),
|
|
mBuffer(nullptr),
|
|
mBufferCount(0),
|
|
mDidWrite(false),
|
|
mEncoder(nullptr)
|
|
{
|
|
}
|
|
|
|
nsJSONWriter::nsJSONWriter(nsIOutputStream *aStream) : mStream(aStream),
|
|
mBuffer(nullptr),
|
|
mBufferCount(0),
|
|
mDidWrite(false),
|
|
mEncoder(nullptr)
|
|
{
|
|
}
|
|
|
|
nsJSONWriter::~nsJSONWriter()
|
|
{
|
|
delete [] mBuffer;
|
|
}
|
|
|
|
nsresult
|
|
nsJSONWriter::SetCharset(const char* aCharset)
|
|
{
|
|
nsresult rv = NS_OK;
|
|
if (mStream) {
|
|
mEncoder = EncodingUtils::EncoderForEncoding(aCharset);
|
|
rv = mEncoder->SetOutputErrorBehavior(nsIUnicodeEncoder::kOnError_Signal,
|
|
nullptr, '\0');
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsJSONWriter::Write(const char16_t *aBuffer, uint32_t aLength)
|
|
{
|
|
if (mStream) {
|
|
return WriteToStream(mStream, mEncoder, aBuffer, aLength);
|
|
}
|
|
|
|
if (!mDidWrite) {
|
|
mBuffer = new char16_t[JSON_STREAM_BUFSIZE];
|
|
mDidWrite = true;
|
|
}
|
|
|
|
if (JSON_STREAM_BUFSIZE <= aLength + mBufferCount) {
|
|
mOutputString.Append(mBuffer, mBufferCount);
|
|
mBufferCount = 0;
|
|
}
|
|
|
|
if (JSON_STREAM_BUFSIZE <= aLength) {
|
|
// we know mBufferCount is 0 because we know we hit the if above
|
|
mOutputString.Append(aBuffer, aLength);
|
|
} else {
|
|
memcpy(&mBuffer[mBufferCount], aBuffer, aLength * sizeof(char16_t));
|
|
mBufferCount += aLength;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
bool nsJSONWriter::DidWrite()
|
|
{
|
|
return mDidWrite;
|
|
}
|
|
|
|
void
|
|
nsJSONWriter::FlushBuffer()
|
|
{
|
|
mOutputString.Append(mBuffer, mBufferCount);
|
|
}
|
|
|
|
nsresult
|
|
nsJSONWriter::WriteToStream(nsIOutputStream *aStream,
|
|
nsIUnicodeEncoder *encoder,
|
|
const char16_t *aBuffer,
|
|
uint32_t aLength)
|
|
{
|
|
nsresult rv;
|
|
int32_t srcLength = aLength;
|
|
uint32_t bytesWritten;
|
|
|
|
// The bytes written to the stream might differ from the char16_t size
|
|
int32_t aDestLength;
|
|
rv = encoder->GetMaxLength(aBuffer, srcLength, &aDestLength);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
// create the buffer we need
|
|
char* destBuf = (char *) NS_Alloc(aDestLength);
|
|
if (!destBuf)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
rv = encoder->Convert(aBuffer, &srcLength, destBuf, &aDestLength);
|
|
if (NS_SUCCEEDED(rv))
|
|
rv = aStream->Write(destBuf, aDestLength, &bytesWritten);
|
|
|
|
NS_Free(destBuf);
|
|
mDidWrite = true;
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSON::Decode(const nsAString& json, JSContext* cx,
|
|
JS::MutableHandle<JS::Value> aRetval)
|
|
{
|
|
nsresult rv = WarnDeprecatedMethod(DecodeWarning);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
|
|
const char16_t *data;
|
|
uint32_t len = NS_StringGetData(json, &data);
|
|
nsCOMPtr<nsIInputStream> stream;
|
|
rv = NS_NewByteInputStream(getter_AddRefs(stream),
|
|
reinterpret_cast<const char*>(data),
|
|
len * sizeof(char16_t),
|
|
NS_ASSIGNMENT_DEPEND);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
return DecodeInternal(cx, stream, len, false, aRetval);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSON::DecodeFromStream(nsIInputStream *aStream, int32_t aContentLength,
|
|
JSContext* cx, JS::MutableHandle<JS::Value> aRetval)
|
|
{
|
|
return DecodeInternal(cx, aStream, aContentLength, true, aRetval);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSON::DecodeToJSVal(const nsAString &str, JSContext *cx,
|
|
JS::MutableHandle<JS::Value> result)
|
|
{
|
|
if (!JS_ParseJSON(cx, static_cast<const char16_t*>(PromiseFlatString(str).get()),
|
|
str.Length(), result)) {
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsJSON::DecodeInternal(JSContext* cx,
|
|
nsIInputStream *aStream,
|
|
int32_t aContentLength,
|
|
bool aNeedsConverter,
|
|
JS::MutableHandle<JS::Value> aRetval)
|
|
{
|
|
// Consume the stream
|
|
nsCOMPtr<nsIChannel> jsonChannel;
|
|
if (!mURI) {
|
|
NS_NewURI(getter_AddRefs(mURI), NS_LITERAL_CSTRING("about:blank"), 0, 0 );
|
|
if (!mURI)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIPrincipal> nullPrincipal = nsNullPrincipal::Create();
|
|
NS_ENSURE_TRUE(nullPrincipal, NS_ERROR_FAILURE);
|
|
|
|
rv = NS_NewInputStreamChannel(getter_AddRefs(jsonChannel),
|
|
mURI,
|
|
aStream,
|
|
nullPrincipal,
|
|
nsILoadInfo::SEC_NORMAL,
|
|
nsIContentPolicy::TYPE_OTHER,
|
|
NS_LITERAL_CSTRING("application/json"));
|
|
|
|
if (!jsonChannel || NS_FAILED(rv))
|
|
return NS_ERROR_FAILURE;
|
|
|
|
RefPtr<nsJSONListener> jsonListener =
|
|
new nsJSONListener(cx, aRetval.address(), aNeedsConverter);
|
|
|
|
//XXX this stream pattern should be consolidated in netwerk
|
|
rv = jsonListener->OnStartRequest(jsonChannel, nullptr);
|
|
if (NS_FAILED(rv)) {
|
|
jsonChannel->Cancel(rv);
|
|
return rv;
|
|
}
|
|
|
|
nsresult status;
|
|
jsonChannel->GetStatus(&status);
|
|
uint64_t offset = 0;
|
|
while (NS_SUCCEEDED(status)) {
|
|
uint64_t available;
|
|
rv = aStream->Available(&available);
|
|
if (rv == NS_BASE_STREAM_CLOSED) {
|
|
rv = NS_OK;
|
|
break;
|
|
}
|
|
if (NS_FAILED(rv)) {
|
|
jsonChannel->Cancel(rv);
|
|
break;
|
|
}
|
|
if (!available)
|
|
break; // blocking input stream has none available when done
|
|
|
|
if (available > UINT32_MAX)
|
|
available = UINT32_MAX;
|
|
|
|
rv = jsonListener->OnDataAvailable(jsonChannel, nullptr,
|
|
aStream,
|
|
offset,
|
|
(uint32_t)available);
|
|
if (NS_FAILED(rv)) {
|
|
jsonChannel->Cancel(rv);
|
|
break;
|
|
}
|
|
|
|
offset += available;
|
|
jsonChannel->GetStatus(&status);
|
|
}
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
rv = jsonListener->OnStopRequest(jsonChannel, nullptr, status);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
NS_NewJSON(nsISupports* aOuter, REFNSIID aIID, void** aResult)
|
|
{
|
|
nsJSON* json = new nsJSON();
|
|
NS_ADDREF(json);
|
|
*aResult = json;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsJSONListener::nsJSONListener(JSContext *cx, JS::Value *rootVal,
|
|
bool needsConverter)
|
|
: mNeedsConverter(needsConverter),
|
|
mCx(cx),
|
|
mRootVal(rootVal)
|
|
{
|
|
}
|
|
|
|
nsJSONListener::~nsJSONListener()
|
|
{
|
|
}
|
|
|
|
NS_INTERFACE_MAP_BEGIN(nsJSONListener)
|
|
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsJSONListener)
|
|
NS_INTERFACE_MAP_ENTRY(nsIRequestObserver)
|
|
NS_INTERFACE_MAP_ENTRY(nsIStreamListener)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_ADDREF(nsJSONListener)
|
|
NS_IMPL_RELEASE(nsJSONListener)
|
|
|
|
NS_IMETHODIMP
|
|
nsJSONListener::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
|
|
{
|
|
mSniffBuffer.Truncate();
|
|
mDecoder = nullptr;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSONListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
|
|
nsresult aStatusCode)
|
|
{
|
|
nsresult rv;
|
|
|
|
// This can happen with short UTF-8 messages (<4 bytes)
|
|
if (!mSniffBuffer.IsEmpty()) {
|
|
// Just consume mSniffBuffer
|
|
rv = ProcessBytes(nullptr, 0);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
JS::Rooted<JS::Value> reviver(mCx, JS::NullValue()), value(mCx);
|
|
|
|
JS::ConstTwoByteChars chars(reinterpret_cast<const char16_t*>(mBufferedChars.Elements()),
|
|
mBufferedChars.Length());
|
|
bool ok = JS_ParseJSONWithReviver(mCx, chars.start().get(),
|
|
uint32_t(mBufferedChars.Length()),
|
|
reviver, &value);
|
|
|
|
*mRootVal = value;
|
|
mBufferedChars.TruncateLength(0);
|
|
return ok ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsJSONListener::OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext,
|
|
nsIInputStream *aStream,
|
|
uint64_t aOffset, uint32_t aLength)
|
|
{
|
|
nsresult rv = NS_OK;
|
|
|
|
if (mNeedsConverter && mSniffBuffer.Length() < 4) {
|
|
uint32_t readCount = (aLength < 4) ? aLength : 4;
|
|
rv = NS_ConsumeStream(aStream, readCount, mSniffBuffer);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
if (mSniffBuffer.Length() < 4)
|
|
return NS_OK;
|
|
}
|
|
|
|
char buffer[JSON_STREAM_BUFSIZE];
|
|
unsigned long bytesRemaining = aLength - mSniffBuffer.Length();
|
|
while (bytesRemaining) {
|
|
unsigned int bytesRead;
|
|
rv = aStream->Read(buffer,
|
|
std::min((unsigned long)sizeof(buffer), bytesRemaining),
|
|
&bytesRead);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
rv = ProcessBytes(buffer, bytesRead);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
bytesRemaining -= bytesRead;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsJSONListener::ProcessBytes(const char* aBuffer, uint32_t aByteLength)
|
|
{
|
|
nsresult rv;
|
|
// Check for BOM, or sniff charset
|
|
nsAutoCString charset;
|
|
if (mNeedsConverter && !mDecoder) {
|
|
if (!nsContentUtils::CheckForBOM((const unsigned char*) mSniffBuffer.get(),
|
|
mSniffBuffer.Length(), charset)) {
|
|
// OK, found no BOM, sniff the first character to see what this is
|
|
// See section 3 of RFC4627 for details on why this works.
|
|
const char *buffer = mSniffBuffer.get();
|
|
if (mSniffBuffer.Length() >= 4) {
|
|
if (buffer[0] == 0x00 && buffer[1] != 0x00 &&
|
|
buffer[2] == 0x00 && buffer[3] != 0x00) {
|
|
charset = "UTF-16BE";
|
|
} else if (buffer[0] != 0x00 && buffer[1] == 0x00 &&
|
|
buffer[2] != 0x00 && buffer[3] == 0x00) {
|
|
charset = "UTF-16LE";
|
|
} else if (buffer[0] != 0x00 && buffer[1] != 0x00 &&
|
|
buffer[2] != 0x00 && buffer[3] != 0x00) {
|
|
charset = "UTF-8";
|
|
}
|
|
} else {
|
|
// Not enough bytes to sniff, assume UTF-8
|
|
charset = "UTF-8";
|
|
}
|
|
}
|
|
|
|
// We should have a unicode charset by now
|
|
rv = CheckCharset(charset.get());
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
mDecoder = EncodingUtils::DecoderForEncoding(charset);
|
|
|
|
// consume the sniffed bytes
|
|
rv = ConsumeConverted(mSniffBuffer.get(), mSniffBuffer.Length());
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
mSniffBuffer.Truncate();
|
|
}
|
|
|
|
if (!aBuffer)
|
|
return NS_OK;
|
|
|
|
if (mNeedsConverter) {
|
|
rv = ConsumeConverted(aBuffer, aByteLength);
|
|
} else {
|
|
uint32_t unichars = aByteLength / sizeof(char16_t);
|
|
rv = Consume((char16_t *) aBuffer, unichars);
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsJSONListener::ConsumeConverted(const char* aBuffer, uint32_t aByteLength)
|
|
{
|
|
nsresult rv;
|
|
int32_t unicharLength = 0;
|
|
int32_t srcLen = aByteLength;
|
|
|
|
rv = mDecoder->GetMaxLength(aBuffer, srcLen, &unicharLength);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
char16_t* endelems = mBufferedChars.AppendElements(unicharLength);
|
|
int32_t preLength = unicharLength;
|
|
rv = mDecoder->Convert(aBuffer, &srcLen, endelems, &unicharLength);
|
|
if (NS_FAILED(rv))
|
|
return rv;
|
|
MOZ_ASSERT(preLength >= unicharLength, "GetMaxLength lied");
|
|
if (preLength > unicharLength)
|
|
mBufferedChars.TruncateLength(mBufferedChars.Length() - (preLength - unicharLength));
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsJSONListener::Consume(const char16_t* aBuffer, uint32_t aByteLength)
|
|
{
|
|
if (!mBufferedChars.AppendElements(aBuffer, aByteLength))
|
|
return NS_ERROR_FAILURE;
|
|
|
|
return NS_OK;
|
|
}
|