starred/sharpcompress
1
0
Fork 0
mirror of https://github.com/adamhathcock/sharpcompress.git synced 2026-09-23 15:34:34 +00:00
Code Issues 975 Packages Projects Releases 25 Wiki Activity

If the requested amount of bytes was not read, assume end of stream

Browse Source
This commit is contained in:
Adam Hathcock
2013-11-24 09:40:38 +00:00
parent b4bfde77d2
commit 3ab38fbfc2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SharpCompress/IO/MarkingBinaryReader.cs
View File

@@ -21,14 +21,12 @@ namespace SharpCompress.IO
public override int Read()
{
CurrentReadByteCount += 4;
return base.Read();
throw new NotImplementedException();
}
public override int Read(byte[] buffer, int index, int count)
{
CurrentReadByteCount += count;
return base.Read(buffer, index, count);
throw new NotImplementedException();
}
public override int Read(char[] buffer, int index, int count)
@@ -38,8 +36,7 @@ namespace SharpCompress.IO
public override bool ReadBoolean()
{
CurrentReadByteCount++;
return base.ReadBoolean();
return BitConverter.ToBoolean(ReadBytes(1), 0);
}
public override byte ReadByte()
@@ -50,7 +47,12 @@ namespace SharpCompress.IO
public override byte[] ReadBytes(int count)
{
CurrentReadByteCount += count;
return base.ReadBytes(count);
var bytes = base.ReadBytes(count);
if (bytes.Length != count)
{
throw new EndOfStreamException(string.Format("Could not read the requested amount of bytes. End of stream reached. Requested: {0} Read: {1}", count, bytes.Length));
}
return bytes;
}
public override char ReadChar()