other-licenses/7zstub/src/7zip/Common/LockedStream.cpp

Tue, 06 Jan 2015 21:39:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 06 Jan 2015 21:39:09 +0100
branch
TOR_BUG_9701
changeset 8
97036ab72558
permissions
-rw-r--r--

Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

michael@0 1 // LockedStream.cpp
michael@0 2
michael@0 3 #include "StdAfx.h"
michael@0 4
michael@0 5 #include "LockedStream.h"
michael@0 6
michael@0 7 HRESULT CLockedInStream::Read(UInt64 startPos, void *data, UInt32 size,
michael@0 8 UInt32 *processedSize)
michael@0 9 {
michael@0 10 NWindows::NSynchronization::CCriticalSectionLock lock(_criticalSection);
michael@0 11 RINOK(_stream->Seek(startPos, STREAM_SEEK_SET, NULL));
michael@0 12 return _stream->Read(data, size, processedSize);
michael@0 13 }
michael@0 14
michael@0 15 STDMETHODIMP CLockedSequentialInStreamImp::Read(void *data, UInt32 size, UInt32 *processedSize)
michael@0 16 {
michael@0 17 UInt32 realProcessedSize = 0;
michael@0 18 HRESULT result = _lockedInStream->Read(_pos, data, size, &realProcessedSize);
michael@0 19 _pos += realProcessedSize;
michael@0 20 if (processedSize != NULL)
michael@0 21 *processedSize = realProcessedSize;
michael@0 22 return result;
michael@0 23 }

mercurial