Mercurial Mercurial > hedgewars / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc/libphysfs/lzma/CPP/7zip/Common/LockedStream.cpp
author nemo
Mon, 10 Apr 2017 12:06:43 -0400
changeset 12213 bb5522e88ab2
permissions -rw-r--r--
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read. Whether this is excessive or whether libphysfs should even be maintained by us is another matter. But at least we shouldn't crash
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12213
bb5522e88ab2 bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read. Whether this is excessive or whether libphysfs should even be maintained by us is another matter. But at least we shouldn't crash
nemo
parents:
diff changeset 
     1
 
// LockedStream.cpp
bb5522e88ab2 bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read. Whether this is excessive or whether libphysfs should even be maintained by us is another matter. But at least we shouldn't crash
nemo
parents:
diff changeset 
     2
 












bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     3


#include "StdAfx.h"













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     4














bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     5


#include "LockedStream.h"













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     6














bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     7


HRESULT CLockedInStream::Read(UInt64 startPos, void *data, UInt32 size, 













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     8


  UInt32 *processedSize)













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




     9


{













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    10


  NWindows::NSynchronization::CCriticalSectionLock lock(_criticalSection);













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    11


  RINOK(_stream->Seek(startPos, STREAM_SEEK_SET, NULL));













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    12


  return _stream->Read(data, size, processedSize);













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    13


}













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    14














bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    15


STDMETHODIMP CLockedSequentialInStreamImp::Read(void *data, UInt32 size, UInt32 *processedSize)













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    16


{













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    17


  UInt32 realProcessedSize = 0;













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    18


  HRESULT result = _lockedInStream->Read(_pos, data, size, &realProcessedSize);













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    19


  _pos += realProcessedSize;













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    20


  if (processedSize != NULL)













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    21


    *processedSize = realProcessedSize;













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    22


  return result;













bb5522e88ab2
bulk copy of latest physfs to our misc/libphysfs since this seems to fix an off-by-1 error reliably hit in readln read of 1 byte probably introduced in the addition of the buffered read.  Whether this is excessive or whether libphysfs should even be maintained by us is another matter.  But at least we shouldn't crash



nemo


parents: 

diff
changeset




    23


}















hedgewars