wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 23:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Guard against re-entrancy in nsStringStream."

Browse source 
This reverts commit 411919cca7a3795d08ec3cd24efa0167683a80fb.
This commit is contained in:
wolfbeast 2019-03-22 14:06:07 +01:00 • committed by Roy Tam
commit df7640136e
1 changed files with 0 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
xpcom/io/nsStringStream.cpp
View file

@ -22,7 +22,6 @@
#include "nsIClassInfoImpl.h" #include "nsIClassInfoImpl.h"
#include "mozilla/Attributes.h" #include "mozilla/Attributes.h"
#include "mozilla/ipc/InputStreamUtils.h" #include "mozilla/ipc/InputStreamUtils.h"
#include "mozilla/ReentrantMonitor.h"
#include "nsIIPCSerializableInputStream.h" #include "nsIIPCSerializableInputStream.h"
using namespace mozilla::ipc; using namespace mozilla::ipc;
@ -51,7 +50,6 @@ public:
NS_DECL_NSICLONEABLEINPUTSTREAM NS_DECL_NSICLONEABLEINPUTSTREAM
nsStringInputStream() nsStringInputStream()
: mMon("nsStringInputStream")
{ {
Clear(); Clear();
} }
@ -91,8 +89,6 @@ private:
nsDependentCSubstring mData; nsDependentCSubstring mData;
uint32_t mOffset; uint32_t mOffset;
mozilla::ReentrantMonitor mMon;
}; };
// This class needs to support threadsafe refcounting since people often // This class needs to support threadsafe refcounting since people often
@ -130,8 +126,6 @@ nsStringInputStream::GetType(uint16_t* aType)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::GetData(nsACString& data) nsStringInputStream::GetData(nsACString& data)
{ {
ReentrantMonitorAutoEnter lock(mMon);
// The stream doesn't have any data when it is closed. We could fake it // The stream doesn't have any data when it is closed. We could fake it
// and return an empty string here, but it seems better to keep this return // and return an empty string here, but it seems better to keep this return
// value consistent with the behavior of the other 'getter' methods. // value consistent with the behavior of the other 'getter' methods.
@ -146,8 +140,6 @@ nsStringInputStream::GetData(nsACString& data)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::SetData(const nsACString& aData) nsStringInputStream::SetData(const nsACString& aData)
{ {
ReentrantMonitorAutoEnter lock(mMon);
mData.Assign(aData); mData.Assign(aData);
mOffset = 0; mOffset = 0;
return NS_OK; return NS_OK;
@ -167,8 +159,6 @@ nsStringInputStream::ToString(char** aResult)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::SetData(const char* aData, int32_t aDataLen) nsStringInputStream::SetData(const char* aData, int32_t aDataLen)
{ {
ReentrantMonitorAutoEnter lock(mMon);
if (NS_WARN_IF(!aData)) { if (NS_WARN_IF(!aData)) {
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
} }
@ -180,8 +170,6 @@ nsStringInputStream::SetData(const char* aData, int32_t aDataLen)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::AdoptData(char* aData, int32_t aDataLen) nsStringInputStream::AdoptData(char* aData, int32_t aDataLen)
{ {
ReentrantMonitorAutoEnter lock(mMon);
if (NS_WARN_IF(!aData)) { if (NS_WARN_IF(!aData)) {
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
} }
@ -193,8 +181,6 @@ nsStringInputStream::AdoptData(char* aData, int32_t aDataLen)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::ShareData(const char* aData, int32_t aDataLen) nsStringInputStream::ShareData(const char* aData, int32_t aDataLen)
{ {
ReentrantMonitorAutoEnter lock(mMon);
if (NS_WARN_IF(!aData)) { if (NS_WARN_IF(!aData)) {
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
} }
@ -211,8 +197,6 @@ nsStringInputStream::ShareData(const char* aData, int32_t aDataLen)
NS_IMETHODIMP_(size_t) NS_IMETHODIMP_(size_t)
nsStringInputStream::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) nsStringInputStream::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf)
{ {
ReentrantMonitorAutoEnter lock(mMon);
size_t n = aMallocSizeOf(this); size_t n = aMallocSizeOf(this);
n += mData.SizeOfExcludingThisIfUnshared(aMallocSizeOf); n += mData.SizeOfExcludingThisIfUnshared(aMallocSizeOf);
return n; return n;
@ -225,8 +209,6 @@ nsStringInputStream::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::Close() nsStringInputStream::Close()
{ {
ReentrantMonitorAutoEnter lock(mMon);
Clear(); Clear();
return NS_OK; return NS_OK;
} }
@ -234,8 +216,6 @@ nsStringInputStream::Close()
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::Available(uint64_t* aLength) nsStringInputStream::Available(uint64_t* aLength)
{ {
ReentrantMonitorAutoEnter lock(mMon);
NS_ASSERTION(aLength, "null ptr"); NS_ASSERTION(aLength, "null ptr");
if (Closed()) { if (Closed()) {
@ -257,8 +237,6 @@ NS_IMETHODIMP
nsStringInputStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure, nsStringInputStream::ReadSegments(nsWriteSegmentFun aWriter, void* aClosure,
uint32_t aCount, uint32_t* aResult) uint32_t aCount, uint32_t* aResult)
{ {
ReentrantMonitorAutoEnter lock(mMon);
NS_ASSERTION(aResult, "null ptr"); NS_ASSERTION(aResult, "null ptr");
NS_ASSERTION(Length() >= mOffset, "bad stream state"); NS_ASSERTION(Length() >= mOffset, "bad stream state");
@ -302,8 +280,6 @@ nsStringInputStream::IsNonBlocking(bool* aNonBlocking)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::Seek(int32_t aWhence, int64_t aOffset) nsStringInputStream::Seek(int32_t aWhence, int64_t aOffset)
{ {
ReentrantMonitorAutoEnter lock(mMon);
if (Closed()) { if (Closed()) {
return NS_BASE_STREAM_CLOSED; return NS_BASE_STREAM_CLOSED;
} }
@ -336,8 +312,6 @@ nsStringInputStream::Seek(int32_t aWhence, int64_t aOffset)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::Tell(int64_t* aOutWhere) nsStringInputStream::Tell(int64_t* aOutWhere)
{ {
ReentrantMonitorAutoEnter lock(mMon);
if (Closed()) { if (Closed()) {
return NS_BASE_STREAM_CLOSED; return NS_BASE_STREAM_CLOSED;
} }
@ -349,8 +323,6 @@ nsStringInputStream::Tell(int64_t* aOutWhere)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::SetEOF() nsStringInputStream::SetEOF()
{ {
ReentrantMonitorAutoEnter lock(mMon);
if (Closed()) { if (Closed()) {
return NS_BASE_STREAM_CLOSED; return NS_BASE_STREAM_CLOSED;
} }
@ -367,8 +339,6 @@ void
nsStringInputStream::Serialize(InputStreamParams& aParams, nsStringInputStream::Serialize(InputStreamParams& aParams,
FileDescriptorArray& /* aFDs */) FileDescriptorArray& /* aFDs */)
{ {
ReentrantMonitorAutoEnter lock(mMon);
StringInputStreamParams params; StringInputStreamParams params;
params.data() = PromiseFlatCString(mData); params.data() = PromiseFlatCString(mData);
aParams = params; aParams = params;
@ -397,8 +367,6 @@ nsStringInputStream::Deserialize(const InputStreamParams& aParams,
Maybe<uint64_t> Maybe<uint64_t>
nsStringInputStream::ExpectedSerializedLength() nsStringInputStream::ExpectedSerializedLength()
{ {
ReentrantMonitorAutoEnter lock(mMon);
return Some(static_cast<uint64_t>(Length())); return Some(static_cast<uint64_t>(Length()));
} }
@ -416,8 +384,6 @@ nsStringInputStream::GetCloneable(bool* aCloneableOut)
NS_IMETHODIMP NS_IMETHODIMP
nsStringInputStream::Clone(nsIInputStream** aCloneOut) nsStringInputStream::Clone(nsIInputStream** aCloneOut)
{ {
ReentrantMonitorAutoEnter lock(mMon);
RefPtr<nsIInputStream> ref = new nsStringInputStream(*this); RefPtr<nsIInputStream> ref = new nsStringInputStream(*this);
ref.forget(aCloneOut); ref.forget(aCloneOut);
return NS_OK; return NS_OK;