Skip to content

Ensure Image.Save can handle non readable / seekable Streams#36805

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

Merged
ericstj merged 4 commits into from
May 22, 2020
Merged

Ensure Image.Save can handle non readable / seekable Streams #36805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb95e85
Ensure Image.Save can handle non readable / seekable Streams
ericstj May 21, 2020
d609a3b
Address feedback
ericstj May 21, 2020
fdddc49
Fix Image.Save on Unix for write only non-seekable stream
ericstj May 21, 2020
0c7eeb3
Remove test which uses bogus handle value
ericstj May 22, 2020
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
4 changes: 2 additions & 2 deletions src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
{
private Stream _stream;

public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
{
// Seeking required
if (!stream.CanSeek)
if (makeSeekable && !stream.CanSeek)
{
var memoryStream = new MemoryStream();
stream.CopyTo(memoryStream);
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
// We use a custom API for this, because there's no easy way
// to get the Stream down to libgdiplus. So, we wrap the stream
// with a set of delegates.
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

try
{
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
{
Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
new HandleRef(this, nativeImage),
new GPStream(stream),
new GPStream(stream, makeSeekable: false),
ref g,
new HandleRef(encoderParams, encoderParamsMemory)));
}
Expand Down
8 changes: 4 additions & 4 deletions src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

// With libgdiplus we use a custom API for this, because there's no easy way
// to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

// With libgdiplus we use a custom API for this, because there's no easy way
// to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

// With libgdiplus we use a custom API for this, because there's no easy way
// to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
{
// With libgdiplus we use a custom API for this, because there's no easy way
// to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
sh.SizeDelegate, header);
Expand Down
47 changes: 40 additions & 7 deletions src/libraries/System.Drawing.Common/tests/BitmapTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

using (FileStream stream = new FileStream(path, FileMode.Open))
{
using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
{
Assert.Equal(100, bitmap.Height);
Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
}
}

private class NonSeekableStream : Stream
[ConditionalTheory(Helpers.IsDrawingSupported)]
[InlineData(true, false)]
[InlineData(false, false)]
[InlineData(false, true)]
public void SaveToRestrictiveStream(bool canRead, bool canSeek)
{
using (Stream backingStream = new MemoryStream())
using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
{
using (Bitmap bitmap = new Bitmap(100, 100))
{
bitmap.Save(restrictiveStream, ImageFormat.Png);
}

backingStream.Position = 0;

using (Bitmap bitmap = new Bitmap(backingStream))
{
Assert.Equal(100, bitmap.Height);
Assert.Equal(100, bitmap.Width);
Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
}
}
}

private class TestStream : Stream
{
private Stream _stream;
private bool _canRead;
private bool _canSeek;

public NonSeekableStream(Stream stream)
public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
{
_stream = stream;
_canRead = canRead;
_canSeek = canSeek;
}

public override bool CanRead => _stream.CanRead;
public override bool CanSeek => false;
public override bool CanRead => _canRead && _stream.CanRead;
public override bool CanSeek => _canSeek && _stream.CanSeek;
public override bool CanWrite => _stream.CanWrite;
public override long Length => _stream.Length;
public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
public override long Position
{
get => _stream.Position;
set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
}
public override void Flush() => _stream.Flush();
public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
public override void SetLength(long value) => _stream.SetLength(value);
public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down
22 changes: 0 additions & 22 deletions src/libraries/System.Drawing.Common/tests/IconTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
}

// libgdiplus causes a segfault when given an invalid Icon handle.
[PlatformSpecific(TestPlatforms.Windows)]
[ConditionalFact(Helpers.IsDrawingSupported)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
public void Ctor_InvalidHandle_Success()
{
using (Icon icon = Icon.FromHandle((IntPtr)1))
using (var stream = new MemoryStream())
{
Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
Assert.Equal(Size.Empty, icon.Size);

using (var newIcon = new Icon(icon, 10, 10))
{
Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
}
}
}

[ConditionalFact(Helpers.IsDrawingSupported)]
public void Ctor_Type_Resource()
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Ensure Image.Save can handle non readable / seekable Streams by ericstj · Pull Request #36805 · dotnet/runtime · GitHub
Skip to content
Ensure Image.Save can handle non readable / seekable Streams#36805

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

 Merged

ericstj
merged 4 commits into

from

May 22, 2020
 Merged


Ensure Image.Save can handle non readable / seekable Streams
#36805
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
eb95e85

Ensure Image.Save can handle non readable / seekable Streams


ericstj May 21, 2020
d609a3b

Address feedback


ericstj May 21, 2020
fdddc49

Fix Image.Save on Unix for write only non-seekable stream


ericstj May 21, 2020
0c7eeb3

Remove test which uses bogus handle value


ericstj May 22, 2020

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


4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/GdiPlusStreamHelper.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,10 +43,10 @@ internal sealed partial class GdiPlusStreamHelper
 {
 private Stream _stream;

 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin)
 public unsafe GdiPlusStreamHelper(Stream stream, bool seekToOrigin, bool makeSeekable = true)
 {
 // Seeking required
 if (!stream.CanSeek)
 if (makeSeekable && !stream.CanSeek)
 {
 var memoryStream = new MemoryStream();
 stream.CopyTo(memoryStream);
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ private protected static IntPtr InitializeFromStream(Stream stream)
 // We use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream
 // with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, true);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: true);

 int st = Gdip.GdipLoadImageFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out IntPtr imagePtr);
Expand DownExpand Up@@ -247,7 +247,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod

 try
 {
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false, makeSeekable: false);
 st = Gdip.GdipSaveImageToDelegate_linux(nativeImage, sh.GetBytesDelegate, sh.PutBytesDelegate,
 sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, ref guid, nativeEncoderParams);

Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/System.Drawing.Common/src/System/Drawing/Image.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,7 +243,7 @@ public void Save(Stream stream, ImageCodecInfo encoder, EncoderParameters? encod
 {
 Gdip.CheckStatus(Gdip.GdipSaveImageToStream(
 new HandleRef(this, nativeImage),
 new GPStream(stream),
 new GPStream(stream, makeSeekable: false),
 ref g,
 new HandleRef(encoderParams, encoderParamsMemory)));
 }
Expand Down

8 changes: 4 additions & 4 deletions
src/libraries/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public Metafile(Stream stream)

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipCreateMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, out nativeImage);

Expand DownExpand Up@@ -101,7 +101,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, Rectangle frameRect, Metafil

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegateI_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand All@@ -120,7 +120,7 @@ public Metafile(Stream stream, IntPtr referenceHdc, RectangleF frameRect, Metafi

 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipRecordMetafileFromDelegate_linux(sh.GetHeaderDelegate, sh.GetBytesDelegate,
 sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate, sh.SizeDelegate, referenceHdc,
 type, ref frameRect, frameUnit, description, out nativeImage);
Expand DownExpand Up@@ -189,7 +189,7 @@ public static MetafileHeader GetMetafileHeader(Stream stream)
 {
 // With libgdiplus we use a custom API for this, because there's no easy way
 // to get the Stream down to libgdiplus. So, we wrap the stream with a set of delegates.
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, false);
 GdiPlusStreamHelper sh = new GdiPlusStreamHelper(stream, seekToOrigin: false);
 int status = Gdip.GdipGetMetafileHeaderFromDelegate_linux(sh.GetHeaderDelegate,
 sh.GetBytesDelegate, sh.PutBytesDelegate, sh.SeekDelegate, sh.CloseDelegate,
 sh.SizeDelegate, header);
Expand Down

47 changes: 40 additions & 7 deletions
src/libraries/System.Drawing.Common/tests/BitmapTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1741,7 +1741,7 @@ public void FromNonSeekableStream()

 using (FileStream stream = new FileStream(path, FileMode.Open))
 {
 using (Bitmap bitmap = new Bitmap(new NonSeekableStream(stream)))
 using (Bitmap bitmap = new Bitmap(new TestStream(stream, canSeek: false)))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
Expand All@@ -1750,22 +1750,55 @@ public void FromNonSeekableStream()
 }
 }

 private class NonSeekableStream : Stream
 [ConditionalTheory(Helpers.IsDrawingSupported)]
 [InlineData(true, false)]
 [InlineData(false, false)]
 [InlineData(false, true)]
 public void SaveToRestrictiveStream(bool canRead, bool canSeek)
 {
 using (Stream backingStream = new MemoryStream())
 using (Stream restrictiveStream = new TestStream(backingStream, canRead, canSeek))
 {
 using (Bitmap bitmap = new Bitmap(100, 100))
 {
 bitmap.Save(restrictiveStream, ImageFormat.Png);
 }

 backingStream.Position = 0;

 using (Bitmap bitmap = new Bitmap(backingStream))
 {
 Assert.Equal(100, bitmap.Height);
 Assert.Equal(100, bitmap.Width);
 Assert.Equal(ImageFormat.Png, bitmap.RawFormat);
 }
 }
 }

 private class TestStream : Stream
 {
 private Stream _stream;
 private bool _canRead;
 private bool _canSeek;

 public NonSeekableStream(Stream stream)
 public TestStream(Stream stream, bool canRead = true, bool canSeek = true)
 {
 _stream = stream;
 _canRead = canRead;
 _canSeek = canSeek;
 }

 public override bool CanRead => _stream.CanRead;
 public override bool CanSeek => false;
 public override bool CanRead => _canRead && _stream.CanRead;
 public override bool CanSeek => _canSeek && _stream.CanSeek;
 public override bool CanWrite => _stream.CanWrite;
 public override long Length => _stream.Length;
 public override long Position { get => _stream.Position; set => throw new InvalidOperationException(); }
 public override long Position
 {
 get => _stream.Position;
 set => _stream.Position = _canSeek ? value : throw new NotSupportedException();
 }
 public override void Flush() => _stream.Flush();
 public override int Read(byte[] buffer, int offset, int count) => _stream.Read(buffer, offset, count);
 public override int Read(byte[] buffer, int offset, int count) => _canRead ? _stream.Read(buffer, offset, count) : throw new NotSupportedException();
 public override long Seek(long offset, SeekOrigin origin) => _stream.Seek(offset, origin);
 public override void SetLength(long value) => _stream.SetLength(value);
 public override void Write(byte[] buffer, int offset, int count) => _stream.Write(buffer, offset, count);
Expand Down

22 changes: 0 additions & 22 deletions
src/libraries/System.Drawing.Common/tests/IconTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,28 +266,6 @@ public void Ctor_NullIcon_ThrowsArgumentNullException()
 AssertExtensions.Throws<ArgumentNullException, ArgumentException>("original", null, () => new Icon((Icon)null, new Size(32, 32)));
 }

 // libgdiplus causes a segfault when given an invalid Icon handle.
 [PlatformSpecific(TestPlatforms.Windows)]
 [ConditionalFact(Helpers.IsDrawingSupported)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
 public void Ctor_InvalidHandle_Success()
 {
 using (Icon icon = Icon.FromHandle((IntPtr)1))
 using (var stream = new MemoryStream())
 {
 Exception ex = Assert.ThrowsAny<Exception>(() => icon.Save(stream));
 Assert.True(ex is COMException || ex is ObjectDisposedException || ex is FileNotFoundException, $"{ex.GetType().ToString()} was thrown.");

 AssertExtensions.Throws<ArgumentException>(null, () => icon.ToBitmap());
 Assert.Equal(Size.Empty, icon.Size);

 using (var newIcon = new Icon(icon, 10, 10))
 {
 Assert.Throws<ObjectDisposedException>(() => newIcon.Handle);
 }
 }
 }

 [ConditionalFact(Helpers.IsDrawingSupported)]
 public void Ctor_Type_Resource()
 {
Expand Down