From 0f2e213ae9796dea73f4bdb0878a5066e8b97cbd Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 2 Dec 2016 09:06:40 +1100
Subject: [PATCH] Add bounds checks. Fix #29

---
 src/ImageSharp/Image/PixelAccessor.cs         | 34 +++++++++++++++++--
 .../Samplers/Processors/CropProcessor.cs      |  5 +++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/ImageSharp/Image/PixelAccessor.cs b/src/ImageSharp/Image/PixelAccessor.cs
index 0f8390677..255285c21 100644
--- a/src/ImageSharp/Image/PixelAccessor.cs
+++ b/src/ImageSharp/Image/PixelAccessor.cs
@@ -104,8 +104,38 @@ namespace ImageSharp
         /// <returns>The <see typeparam="TColor"/> at the specified position.</returns>
         public TColor this[int x, int y]
         {
-            get { return Unsafe.Read<TColor>(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>())); }
-            set { Unsafe.Write(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>()), value); }
+            get
+            {
+#if DEBUG   
+                if (x < 0 || x >= this.Width)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(x), x, $"{x} is outwith the image bounds.");
+                }
+
+                if (y < 0 || y >= this.Height)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(y), y, $"{y} is outwith the image bounds.");
+                }
+#endif
+                return Unsafe.Read<TColor>(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>()));
+            }
+
+            set
+            {
+#if DEBUG   
+                if (x < 0 || x >= this.Width)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(x), x, $"{x} is outwith the image bounds.");
+                }
+
+                if (y < 0 || y >= this.Height)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(y), y, $"{y} is outwith the image bounds.");
+                }
+#endif
+
+                Unsafe.Write(this.pixelsBase + (((y * this.Width) + x) * Unsafe.SizeOf<TColor>()), value);
+            }
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Samplers/Processors/CropProcessor.cs b/src/ImageSharp/Samplers/Processors/CropProcessor.cs
index 0e8510837..7d64e8868 100644
--- a/src/ImageSharp/Samplers/Processors/CropProcessor.cs
+++ b/src/ImageSharp/Samplers/Processors/CropProcessor.cs
@@ -24,6 +24,11 @@ namespace ImageSharp.Processors
             int sourceX = sourceRectangle.X;
             int sourceY = sourceRectangle.Y;
 
+            Guard.MustBeGreaterThanOrEqualTo(startX, sourceX, nameof(targetRectangle));
+            Guard.MustBeGreaterThanOrEqualTo(startY, sourceY, nameof(targetRectangle));
+            Guard.MustBeLessThanOrEqualTo(endX, sourceRectangle.Right, nameof(targetRectangle));
+            Guard.MustBeLessThanOrEqualTo(endY, sourceRectangle.Bottom, nameof(targetRectangle));
+
             using (PixelAccessor<TColor, TPacked> sourcePixels = source.Lock())
             using (PixelAccessor<TColor, TPacked> targetPixels = target.Lock())
             {