From 6a613e3402b921b4ba9e4611cbffee1069e75527 Mon Sep 17 00:00:00 2001 From: Dean Chalk Date: Thu, 9 Apr 2020 08:36:40 +0100 Subject: [PATCH] #3178 InfiniteCanvas Heap Corruption --- ...initeCanvasVirtualDrawingSurface.Render.cs | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs index 66e7e62b56b..18f75ee78d6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs @@ -30,17 +30,31 @@ public partial class InfiniteCanvasVirtualDrawingSurface internal void ReDraw(Rect viewPort, float zoom) { var toDraw = GetDrawingBoundaries(viewPort); - var scale = _screenScale * zoom; + var rect = ScaleRect(toDraw, scale); + var dpi = BaseCanvasDPI * (float)scale; - using (var drawingSession = CanvasComposition.CreateDrawingSession(_drawingSurface, ScaleRect(toDraw, scale), BaseCanvasDPI * (float)scale)) + try { - drawingSession.Clear(Colors.White); - foreach (var drawable in _visibleList) + using (var drawingSession = CanvasComposition.CreateDrawingSession(_drawingSurface, rect, dpi)) { - drawable.Draw(drawingSession, toDraw); + drawingSession.Clear(Colors.White); + foreach (var drawable in _visibleList) + { + drawable.Draw(drawingSession, toDraw); + } } } + catch (ArgumentException) + { + /* CanvasComposition.CreateDrawingSession has an internal + * limit on the size of the updateRectInPixels parameter, + * which we dont know, so we can get an ArgumentException + * if there is a lot of extreme zooming and panning + * Therefore, the only solution is to silently catch the + * exception and allow the app to continue + */ + } } private Rect ScaleRect(Rect rect, double scale)