diff -Nru imagemagick-6.8.9.9/debian/changelog imagemagick-6.8.9.9/debian/changelog --- imagemagick-6.8.9.9/debian/changelog 2016-02-29 16:25:15.000000000 -0800 +++ imagemagick-6.8.9.9/debian/changelog 2016-03-03 16:00:54.000000000 -0800 @@ -1,3 +1,10 @@ +imagemagick (8:6.8.9.9-7ubuntu2) xenial; urgency=medium + + * Add backport of a54fe0e8 to fix segmentation faults during + php-imagick tests (LP: #1549942). + + -- Nishanth Aravamudan Wed, 02 Mar 2016 15:45:35 -0800 + imagemagick (8:6.8.9.9-7ubuntu1) xenial; urgency=medium * Add backports of d6054824, 95c8394e and 68c6a7d to diff -Nru imagemagick-6.8.9.9/debian/patches/0076-Fix-segmentation-fault-with-php-imagick.patch imagemagick-6.8.9.9/debian/patches/0076-Fix-segmentation-fault-with-php-imagick.patch --- imagemagick-6.8.9.9/debian/patches/0076-Fix-segmentation-fault-with-php-imagick.patch 1969-12-31 16:00:00.000000000 -0800 +++ imagemagick-6.8.9.9/debian/patches/0076-Fix-segmentation-fault-with-php-imagick.patch 2016-03-03 15:40:02.000000000 -0800 @@ -0,0 +1,47 @@ +Description: Backport of upstream commit a54fe0e8 +Author: Nishanth Aravamudan +Origin: backport, https://github.com/ImageMagick/ImageMagick/commit/a54fe0e8600eaf3dc6fe717d3c0398001507f723 + +--- imagemagick-6.8.9.9.orig/magick/cache.c ++++ imagemagick-6.8.9.9/magick/cache.c +@@ -583,29 +583,6 @@ MagickExport void ClonePixelCacheMethods + % + */ + +-static inline void CopyPixels(PixelPacket *destination, +- const PixelPacket *source,const MagickSizeType number_pixels) +-{ +-#if !defined(MAGICKCORE_OPENMP_SUPPORT) || (MAGICKCORE_QUANTUM_DEPTH <= 8) +- (void) memcpy(destination,source,(size_t) number_pixels*sizeof(*source)); +-#else +- { +- register MagickOffsetType +- i; +- +- if ((number_pixels*sizeof(*source)) < MagickMaxBufferExtent) +- { +- (void) memcpy(destination,source,(size_t) number_pixels* +- sizeof(*source)); +- return; +- } +- #pragma omp parallel for +- for (i=0; i < (MagickOffsetType) number_pixels; i++) +- destination[i]=source[i]; +- } +-#endif +-} +- + static inline MagickSizeType MagickMin(const MagickSizeType x, + const MagickSizeType y) + { +@@ -651,8 +628,8 @@ static MagickBooleanType ClonePixelCache + /* + Identical pixel cache morphology. + */ +- CopyPixels(clone_info->pixels,cache_info->pixels,cache_info->columns* +- cache_info->rows); ++ (void) memcpy(clone_info->pixels,cache_info->pixels,cache_info->columns* ++ cache_info->rows*sizeof(*cache_info->pixels)); + if ((cache_info->active_index_channel != MagickFalse) && + (clone_info->active_index_channel != MagickFalse)) + (void) memcpy(clone_info->indexes,cache_info->indexes, diff -Nru imagemagick-6.8.9.9/debian/patches/series imagemagick-6.8.9.9/debian/patches/series --- imagemagick-6.8.9.9/debian/patches/series 2016-02-26 14:51:07.000000000 -0800 +++ imagemagick-6.8.9.9/debian/patches/series 2016-03-03 15:40:02.000000000 -0800 @@ -74,3 +74,4 @@ 0073-Fixed-memory-leaks.patch 0074-Fix-overflow-in-pict-image-parsing.patch 0075-Fix-buffer-overflow-in-icon-parsing-code.patch +0076-Fix-segmentation-fault-with-php-imagick.patch