(no commit message)

diff --git a/PerlMagick/Changelog b/PerlMagick/Changelog
index 66111304f4cb63da9e4b2544473fc425309757ce..6ea8371c6921ac9809cb8b99218b2a38e4bde4b4 100644 (file)
--- a/PerlMagick/Changelog
+++ b/PerlMagick/Changelog
@@ -1,3 +1,7 @@
+2011-01-25  6.6.7-3 Cristy  <quetzlzacatenango@image...>
+  * Verify color parameter is a Perl array to avoid seg fault (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=7&t=17928).
+
 2010-11-11  6.6.5-6 Cristy  <quetzlzacatenango@image...>
   * Check that image exists before accessing its member (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=17502).

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 6f64e50f177fc336be412127ede01598b6f941a3..d8cfef0a37d00f88361947b44e3edfefaa32053b 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -13251,7 +13251,8 @@ SetPixel(ref,...)
     }
     (void) SetImageStorageClass(image,DirectClass);
     q=GetAuthenticPixels(image,region.x,region.y,1,1,exception);
-    if ((q == (PixelPacket *) NULL) || (av == (AV *) NULL))
+    if ((q == (PixelPacket *) NULL) || (av == (AV *) NULL) ||
+        (SvTYPE(av) != SVt_PVAV))
       PUSHs(&sv_undef);
     else
       {