add test (#13129)

throw instead of crash
DynamoDS · Jul 22, 2022 · ac8a987 · ac8a987
1 parent 375351d
commit ac8a987
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/src/Libraries/CoreNodes/FileSystem.cs b/src/Libraries/CoreNodes/FileSystem.cs
@@ -1,12 +1,17 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Autodesk.DesignScript.Runtime;
+using Dynamo.Events;
 using Dynamo.Graph.Nodes;
+using Dynamo.Logging;
+using Dynamo.Session;
 using Path = System.IO.Path;
 using Rectangle = System.Drawing.Rectangle;
 
@@ -440,6 +445,13 @@ public static Bitmap FromPixels(Color[] colors, int width, int height)
 
         private static Bitmap FromPixelsHelper(IEnumerable<Color> colors, int width, int height)
         {
+            //if the color data is larger than will fit in the bitmap buffer
+            //then this can cause an access violation - so we'll throw an exception.
+            if(colors?.Count() > width * height)
+            {
+                throw new ArgumentOutOfRangeException("colors", Properties.Resources.BitmapOverflowError);
+            }
+
             var bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
             var data = bitmap.LockBits(
                 new Rectangle(0, 0, width, height),

diff --git a/src/Libraries/CoreNodes/Properties/Resources.Designer.cs b/src/Libraries/CoreNodes/Properties/Resources.Designer.cs
diff --git a/src/Libraries/CoreNodes/Properties/Resources.en-US.resx b/src/Libraries/CoreNodes/Properties/Resources.en-US.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="BitmapOverflowError" xml:space="preserve">
+    <value>The supplied color data is too large to fit in the image bounds.</value>
+  </data>
   <data name="EnumDateOfWeekFriday" xml:space="preserve">
     <value>Friday</value>
   </data>

diff --git a/src/Libraries/CoreNodes/Properties/Resources.resx b/src/Libraries/CoreNodes/Properties/Resources.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="BitmapOverflowError" xml:space="preserve">
+    <value>The supplied color data is too large to fit in the image bounds.</value>
+  </data>
   <data name="EnumDateOfWeekFriday" xml:space="preserve">
     <value>Friday</value>
   </data>

diff --git a/test/Libraries/CoreNodesTests/FileTests.cs b/test/Libraries/CoreNodesTests/FileTests.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -413,6 +414,17 @@ public void Image_FromPixels()
 
             Assert.AreEqual(Image.Pixels(bmpFromRect), Image.Pixels(bmpFromFlat));
         }
+        [Test, Category("UnitTests")]
+        public void Image_FromPixels_ThrowsWhenDataTooLarge()
+        {
+            const int size = 50;
+
+            var pixels = Enumerable.Repeat(Color.ByColor(System.Drawing.Color.Blue), size).ToArray();
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                Image.FromPixels(pixels, 1, 1);
+            });
+        }
 
         [Test, Category("UnitTests")]
         public void Image_Dimensions()