Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Don't enforce a minimum buffer size for zero-length buffers in FileStream (fix for 645193) #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
imphasing wants to merge 2 commits into from
Closed

Don't enforce a minimum buffer size for zero-length buffers in FileStream (fix for 645193) #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff6db2
[Fix] Don't enforce a minimum size for zero-length buffers, fixing #6…
imphasing Oct 26, 2010
78e4c74
Don't use a buffer size of 1 for zero-length buffers
imphasing Oct 29, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 27 additions & 25 deletions mcs/class/corlib/System.IO/FileStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,7 @@ internal FileStream (IntPtr handle, FileAccess access, bool ownsHandle, int buff
#else
this.anonymous = false;
#endif
if (isZeroSize)
bufferSize = 1;

InitBuffer (bufferSize);
InitBuffer (bufferSize, isZeroSize);

if (canseek) {
buf_start = MonoIO.Seek (handle, 0, SeekOrigin.Current, out error);
Expand Down Expand Up @@ -335,7 +332,7 @@ internal FileStream (string path, FileMode mode, FileAccess access, FileShare sh
}
}

InitBuffer (bufferSize);
InitBuffer (bufferSize, false);

if (mode==FileMode.Append) {
this.Seek (0, SeekOrigin.End);
Expand Down Expand Up @@ -1089,30 +1086,35 @@ private int ReadData (IntPtr handle, byte[] buf, int offset,
return(amount);
}

void InitBuffer (int size)
void InitBuffer (int size, bool isZeroSize)
{
if (size <= 0)
throw new ArgumentOutOfRangeException ("bufferSize", "Positive number required.");

size = Math.Max (size, 8);

//
// Instead of allocating a new default buffer use the
// last one if there is any available
//
if (size <= DefaultBufferSize && buf_recycle != null) {
lock (buf_recycle_lock) {
if (buf_recycle != null) {
buf = buf_recycle;
buf_recycle = null;
if (isZeroSize) {
size = 0;
buf = new byte[1];
} else {
if (size <= 0)
throw new ArgumentOutOfRangeException ("bufferSize", "Positive number required.");

size = Math.Max (size, 8);

//
// Instead of allocating a new default buffer use the
// last one if there is any available
//
if (size <= DefaultBufferSize && buf_recycle != null) {
lock (buf_recycle_lock) {
if (buf_recycle != null) {
buf = buf_recycle;
buf_recycle = null;
}
}
}

if (buf == null)
buf = new byte [size];
else
Array.Clear (buf, 0, size);
}

if (buf == null)
buf = new byte [size];
else
Array.Clear (buf, 0, size);

buf_size = size;
// buf_start = 0;
Expand Down