Skip to content

Commit 76401e1

Browse files
author
Cristy
committed
Evaluate lazy pixel cache morphology to prevent buffer overflow (bug report from Ibrahim M. El-Sayed)
1 parent e077971 commit 76401e1

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Diff for: ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2016-07-01 7.0.2-7 Cristy <quetzlzacatenango@image...>
2+
* Evaluate lazy pixel cache morphology to prevent buffer overflow (bug report
3+
from Ibrahim M. El-Sayed).
4+
15
2016-07-30 7.0.2-6 Cristy <quetzlzacatenango@image...>
26
* Release ImageMagick version 7.0.2-6, GIT revision 18651:df24175:20160729.
37

Diff for: MagickCore/enhance.c

+4
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,8 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
10491049
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
10501050
if (SetImageGray(image,exception) != MagickFalse)
10511051
(void) SetImageColorspace(image,GRAYColorspace,exception);
1052+
if (SyncImagePixelCache(image,exception) == MagickFalse)
1053+
return(MagickFalse);
10521054
black=(double *) AcquireQuantumMemory(GetPixelChannels(image),sizeof(*black));
10531055
white=(double *) AcquireQuantumMemory(GetPixelChannels(image),sizeof(*white));
10541056
histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,GetPixelChannels(image)*
@@ -1533,6 +1535,8 @@ MagickExport MagickBooleanType EqualizeImage(Image *image,
15331535
#endif
15341536
if (image->debug != MagickFalse)
15351537
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
1538+
if (SyncImagePixelCache(image,exception) == MagickFalse)
1539+
return(MagickFalse);
15361540
equalize_map=(double *) AcquireQuantumMemory(MaxMap+1UL,
15371541
GetPixelChannels(image)*sizeof(*equalize_map));
15381542
histogram=(double *) AcquireQuantumMemory(MaxMap+1UL,GetPixelChannels(image)*

0 commit comments

Comments
 (0)