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

Bug 1128959 - Implement the WHATWG Streams spec - part 17 - Creating FetchStream as a out param in order to avoid JS hazards, r=bz

Browse Source
This commit is contained in:
Andrea Marchesini
2017-08-10 18:04:56 -07:00
parent 693036056d
commit e3427f1588
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dom/fetch/Fetch.cpp
View File

@@ -1116,12 +1116,9 @@ FetchBody<Derived>::GetBody(JSContext* aCx,
return; return;
} }
JS::Rooted<JSObject*> body(aCx, JS::Rooted<JSObject*> body(aCx);
FetchStream::Create(aCx, FetchStream::Create(aCx, this, DerivedClass()->GetParentObject(),
this, inputStream, &body, aRv);
DerivedClass()->GetParentObject(),
inputStream,
aRv));
if (NS_WARN_IF(aRv.Failed())) { if (NS_WARN_IF(aRv.Failed())) {
return; return;
} }

26
dom/fetch/FetchStream.cpp
View File

@@ -101,10 +101,10 @@ private:
NS_IMPL_ISUPPORTS(FetchStream, nsIInputStreamCallback, nsIObserver, NS_IMPL_ISUPPORTS(FetchStream, nsIInputStreamCallback, nsIObserver,
nsISupportsWeakReference) nsISupportsWeakReference)
/* static */ JSObject* /* static */ void
FetchStream::Create(JSContext* aCx, FetchStreamHolder* aStreamHolder, FetchStream::Create(JSContext* aCx, FetchStreamHolder* aStreamHolder,
nsIGlobalObject* aGlobal, nsIInputStream* aInputStream, nsIGlobalObject* aGlobal, nsIInputStream* aInputStream,
ErrorResult& aRv) JS::MutableHandle<JSObject*> aStream, ErrorResult& aRv)
{ {
MOZ_DIAGNOSTIC_ASSERT(aCx); MOZ_DIAGNOSTIC_ASSERT(aCx);
MOZ_DIAGNOSTIC_ASSERT(aStreamHolder); MOZ_DIAGNOSTIC_ASSERT(aStreamHolder);
@@ -117,12 +117,12 @@ FetchStream::Create(JSContext* aCx, FetchStreamHolder* aStreamHolder,
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService(); nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (NS_WARN_IF(!os)) { if (NS_WARN_IF(!os)) {
aRv.Throw(NS_ERROR_FAILURE); aRv.Throw(NS_ERROR_FAILURE);
return nullptr; return;
} }
aRv = os->AddObserver(stream, DOM_WINDOW_DESTROYED_TOPIC, true); aRv = os->AddObserver(stream, DOM_WINDOW_DESTROYED_TOPIC, true);
if (NS_WARN_IF(aRv.Failed())) { if (NS_WARN_IF(aRv.Failed())) {
return nullptr; return;
} }
} else { } else {
@@ -133,7 +133,7 @@ FetchStream::Create(JSContext* aCx, FetchStreamHolder* aStreamHolder,
new FetchStreamWorkerHolder(stream)); new FetchStreamWorkerHolder(stream));
if (NS_WARN_IF(!holder->HoldWorker(workerPrivate, Closing))) { if (NS_WARN_IF(!holder->HoldWorker(workerPrivate, Closing))) {
aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR); aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
return nullptr; return;
} }
// Note, this will create a ref-cycle between the holder and the stream. // Note, this will create a ref-cycle between the holder and the stream.
@@ -156,14 +156,17 @@ FetchStream::Create(JSContext* aCx, FetchStreamHolder* aStreamHolder,
JS::NewReadableExternalSourceStreamObject(aCx, stream, FETCH_STREAM_FLAG)); JS::NewReadableExternalSourceStreamObject(aCx, stream, FETCH_STREAM_FLAG));
if (!body) { if (!body) {
aRv.StealExceptionFromJSContext(aCx); aRv.StealExceptionFromJSContext(aCx);
return nullptr; return;
} }
stream->mReadableStream = body; stream->mReadableStream = body;
// JS engine will call the finalize callback. // This will be released in FetchStream::FinalizeCallback(). We are
// guaranteed the jsapi will call FinalizeCallback when ReadableStream
// js object is finalized.
NS_ADDREF(stream.get()); NS_ADDREF(stream.get());
return body;
aStream.set(body);
} }
/* static */ void /* static */ void
@@ -307,7 +310,11 @@ FetchStream::CancelCallback(JSContext* aCx, JS::HandleObject aStream,
MOZ_DIAGNOSTIC_ASSERT(aUnderlyingSource); MOZ_DIAGNOSTIC_ASSERT(aUnderlyingSource);
MOZ_DIAGNOSTIC_ASSERT(aFlags == FETCH_STREAM_FLAG); MOZ_DIAGNOSTIC_ASSERT(aFlags == FETCH_STREAM_FLAG);
RefPtr<FetchStream> stream = static_cast<FetchStream*>(aUnderlyingSource); // This is safe because we created an extra reference in FetchStream::Create()
// that won't be released until FetchStream::FinalizeCallback() is called.
// We are guaranteed that won't happen until the js ReadableStream object
// is finalized.
FetchStream* stream = static_cast<FetchStream*>(aUnderlyingSource);
if (stream->mInputStream) { if (stream->mInputStream) {
stream->mInputStream->CloseWithStatus(NS_BASE_STREAM_CLOSED); stream->mInputStream->CloseWithStatus(NS_BASE_STREAM_CLOSED);
@@ -342,6 +349,7 @@ FetchStream::FinalizeCallback(void* aUnderlyingSource, uint8_t aFlags)
// This can be called in any thread. // This can be called in any thread.
// This takes ownership of the ref created in FetchStream::Create().
RefPtr<FetchStream> stream = RefPtr<FetchStream> stream =
dont_AddRef(static_cast<FetchStream*>(aUnderlyingSource)); dont_AddRef(static_cast<FetchStream*>(aUnderlyingSource));

4
dom/fetch/FetchStream.h
View File

@@ -36,10 +36,10 @@ public:
NS_DECL_NSIINPUTSTREAMCALLBACK NS_DECL_NSIINPUTSTREAMCALLBACK
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER
static JSObject* static void
Create(JSContext* aCx, FetchStreamHolder* aStreamHolder, Create(JSContext* aCx, FetchStreamHolder* aStreamHolder,
nsIGlobalObject* aGlobal, nsIInputStream* aInputStream, nsIGlobalObject* aGlobal, nsIInputStream* aInputStream,
ErrorResult& aRv); JS::MutableHandle<JSObject*> aStream, ErrorResult& aRv);
void void
Close(); Close();