lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-08 02:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speculative fix for System.OverflowException

Browse Source 
* Crash report came in with System.OverflowException inside FillPolygon,
  but I don't see a way for these values to get too large (or invalid
  some other way).
This commit is contained in:
baldurk
2014-10-13 20:07:09 +01:00
parent 2ffb2c6a05
commit 87bcde1c4c
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Controls/RangeHistogram.cs
+23 -5
View File
@@ -31,6 +31,7 @@ using System.Data;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using renderdocui.Code;
namespace renderdocui.Controls namespace renderdocui.Controls
{ {
@@ -458,16 +459,24 @@ namespace renderdocui.Controls
} }
} }
Point[] blackTriangle = { new Point(blackPoint.Right, m_MarkerSize*2), Point[] blackTriangle = { new Point(blackPoint.Right, m_MarkerSize*2),
new Point(blackPoint.Right+m_MarkerSize, 0), new Point(blackPoint.Right + m_MarkerSize, 0),
new Point(blackPoint.Right-m_MarkerSize, 0) }; new Point(blackPoint.Right - m_MarkerSize, 0) };
e.Graphics.FillPolygon(Brushes.DarkGray, blackTriangle);
Point[] whiteTriangle = { new Point(whitePoint.Left, whitePoint.Bottom-m_MarkerSize*2+m_Margin), Point[] whiteTriangle = { new Point(whitePoint.Left, whitePoint.Bottom-m_MarkerSize*2+m_Margin),
new Point(whitePoint.Left+m_MarkerSize, whitePoint.Bottom+m_Margin), new Point(whitePoint.Left+m_MarkerSize, whitePoint.Bottom+m_Margin),
new Point(whitePoint.Left-m_MarkerSize, whitePoint.Bottom+m_Margin) }; new Point(whitePoint.Left-m_MarkerSize, whitePoint.Bottom+m_Margin) };
for (int i = 0; i < 3; i++)
{
blackTriangle[i].X = Helpers.Clamp(blackTriangle[i].X, (int)e.Graphics.ClipBounds.Left-1, (int)e.Graphics.ClipBounds.Right+1);
blackTriangle[i].Y = Helpers.Clamp(blackTriangle[i].Y, (int)e.Graphics.ClipBounds.Top-1, (int)e.Graphics.ClipBounds.Bottom+1);
whiteTriangle[i].X = Helpers.Clamp(whiteTriangle[i].X, (int)e.Graphics.ClipBounds.Left-1, (int)e.Graphics.ClipBounds.Right+1);
whiteTriangle[i].Y = Helpers.Clamp(whiteTriangle[i].Y, (int)e.Graphics.ClipBounds.Top-1, (int)e.Graphics.ClipBounds.Bottom+1);
}
e.Graphics.FillPolygon(Brushes.DarkGray, blackTriangle);
e.Graphics.FillPolygon(Brushes.DarkGray, whiteTriangle); e.Graphics.FillPolygon(Brushes.DarkGray, whiteTriangle);
blackTriangle[0].Y -= 2; blackTriangle[0].Y -= 2;
@@ -484,6 +493,15 @@ namespace renderdocui.Controls
whiteTriangle[1].X -= 2; whiteTriangle[1].X -= 2;
whiteTriangle[2].X += 2; whiteTriangle[2].X += 2;
for (int i = 0; i < 3; i++)
{
blackTriangle[i].X = Helpers.Clamp(blackTriangle[i].X, (int)e.Graphics.ClipBounds.Left - 1, (int)e.Graphics.ClipBounds.Right + 1);
blackTriangle[i].Y = Helpers.Clamp(blackTriangle[i].Y, (int)e.Graphics.ClipBounds.Top - 1, (int)e.Graphics.ClipBounds.Bottom + 1);
whiteTriangle[i].X = Helpers.Clamp(whiteTriangle[i].X, (int)e.Graphics.ClipBounds.Left - 1, (int)e.Graphics.ClipBounds.Right + 1);
whiteTriangle[i].Y = Helpers.Clamp(whiteTriangle[i].Y, (int)e.Graphics.ClipBounds.Top - 1, (int)e.Graphics.ClipBounds.Bottom + 1);
}
e.Graphics.FillPolygon(Brushes.Black, blackTriangle); e.Graphics.FillPolygon(Brushes.Black, blackTriangle);
e.Graphics.FillPolygon(Brushes.White, whiteTriangle); e.Graphics.FillPolygon(Brushes.White, whiteTriangle);
} }