Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1163916 (part 2) - Avoid a static constructor for kCompressedBufferLength. r=froydnj.

Browse Source 
--HG--
extra : rebase_source : b44ed66dd66481c63bbddafefca34b88860ecc1b
This commit is contained in:
Nicholas Nethercote 2015-05-13 16:48:32 -07:00
parent 53bed9bec0
commit 1a8597278b
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xpcom/io/SnappyUncompressInputStream.cpp
View File

@ -16,8 +16,16 @@ namespace mozilla {
NS_IMPL_ISUPPORTS(SnappyUncompressInputStream,
nsIInputStream);
static size_t kCompressedBufferLength =
detail::SnappyFrameUtils::MaxCompressedBufferLength(snappy::kBlockSize);
// Putting kCompressedBufferLength inside a function avoids a static
// constructor.
static size_t CompressedBufferLength()
{
static size_t kCompressedBufferLength =
detail::SnappyFrameUtils::MaxCompressedBufferLength(snappy::kBlockSize);
MOZ_ASSERT(kCompressedBufferLength > 0);
return kCompressedBufferLength;
}
SnappyUncompressInputStream::SnappyUncompressInputStream(nsIInputStream* aBaseStream)
: mBaseStream(aBaseStream)
@ -195,7 +203,7 @@ SnappyUncompressInputStream::ParseNextChunk(uint32_t* aBytesReadOut)
}
if (!mCompressedBuffer) {
mCompressedBuffer.reset(new (fallible) char[kCompressedBufferLength]);
mCompressedBuffer.reset(new (fallible) char[CompressedBufferLength()]);
if (NS_WARN_IF(!mCompressedBuffer)) {
return NS_ERROR_OUT_OF_MEMORY;
}
@ -208,7 +216,7 @@ SnappyUncompressInputStream::ParseNextChunk(uint32_t* aBytesReadOut)
const uint32_t firstReadLength = kHeaderLength +
kStreamIdentifierDataLength +
kHeaderLength;
MOZ_ASSERT(firstReadLength <= kCompressedBufferLength);
MOZ_ASSERT(firstReadLength <= CompressedBufferLength());
rv = ReadAll(mCompressedBuffer.get(), firstReadLength, firstReadLength,
aBytesReadOut);
@ -261,7 +269,7 @@ SnappyUncompressInputStream::ParseNextChunk(uint32_t* aBytesReadOut)
// We have no decompressed data, but we do know the size of the next chunk.
// Read at least that much from the base stream.
uint32_t readLength = mNextChunkDataLength;
MOZ_ASSERT(readLength <= kCompressedBufferLength);
MOZ_ASSERT(readLength <= CompressedBufferLength());
// However, if there is enough data in the base stream, also read the next
// chunk header. This helps optimize the stream by avoiding many small reads.
@ -270,7 +278,7 @@ SnappyUncompressInputStream::ParseNextChunk(uint32_t* aBytesReadOut)
if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
if (avail >= (readLength + kHeaderLength)) {
readLength += kHeaderLength;
MOZ_ASSERT(readLength <= kCompressedBufferLength);
MOZ_ASSERT(readLength <= CompressedBufferLength());
}
rv = ReadAll(mCompressedBuffer.get(), readLength, mNextChunkDataLength,