From a9e1260dcd2c48bc7d56d168bcaf2537897d3221 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 7 Feb 2016 15:13:08 -0500 Subject: [PATCH] Fix an out of bound in generic decoder Origin: upstream, https://github.com/ImageMagick/ImageMagick/commit/430403b0029b37decf216d57f810899cab2317dd bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/imagemagick/+bug/1542785 bug-debian: https://bugs.debian.org/#832785 bug: https://github.com/ImageMagick/ImageMagick/issues/126 --- magick/quantum-import.c | 2 +- magick/quantum.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/magick/quantum-import.c b/magick/quantum-import.c index 5a32f1f61..1dd0f99a6 100644 --- a/magick/quantum-import.c +++ b/magick/quantum-import.c @@ -1169,7 +1169,7 @@ static void ImportCbYCrYQuantum(const Image *image,QuantumInfo *quantum_info, n=0; quantum=0; - for (x=0; x < (ssize_t) number_pixels; x+=2) + for (x=0; x < (ssize_t) number_pixels; x+=4) { for (i=0; i < 4; i++) { diff --git a/magick/quantum.c b/magick/quantum.c index 23ea85829..30ad4d50a 100644 --- a/magick/quantum.c +++ b/magick/quantum.c @@ -324,6 +324,9 @@ MagickExport size_t GetQuantumExtent(const Image *image, case BGRAQuantum: packet_size=4; break; case CMYKQuantum: packet_size=4; break; case CMYKAQuantum: packet_size=5; break; + case CbYCrAQuantum: packet_size=4; break; + case CbYCrQuantum: packet_size=3; break; + case CbYCrYQuantum: packet_size=4; break; default: break; } extent=MagickMax(image->columns,image->rows); @@ -872,7 +875,6 @@ MagickExport void SetQuantumPack(QuantumInfo *quantum_info, quantum_info->pack=pack; } - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %