Use size_t for lengths in stream objects

Provides safety against them accidentally becoming negative because
of bugs in the calculations.

Also does the same to CharArray and friends as they were strongly
connection to the stream objects.
This commit is contained in:
Pierre Ossman
2019-09-23 11:00:17 +02:00
committed by Lauri Kasanen
parent 346fccb96c
commit 259f1055cb
31 changed files with 180 additions and 178 deletions

View File

@@ -34,12 +34,12 @@ namespace rdr {
public:
ZlibInStream(int bufSize=0);
ZlibInStream(size_t bufSize=0);
virtual ~ZlibInStream();
void setUnderlying(InStream* is, int bytesIn);
void setUnderlying(InStream* is, size_t bytesIn);
void flushUnderlying();
int pos();
size_t pos();
void reset();
private:
@@ -47,14 +47,14 @@ namespace rdr {
void init();
void deinit();
int overrun(int itemSize, int nItems, bool wait);
size_t overrun(size_t itemSize, size_t nItems, bool wait);
bool decompress(bool wait);
InStream* underlying;
int bufSize;
int offset;
size_t bufSize;
size_t offset;
z_stream_s* zs;
int bytesIn;
size_t bytesIn;
U8* start;
};