summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristy <urban-warrior@imagemagick.org>2019-06-16 18:55:24 -0400
committerCristy <urban-warrior@imagemagick.org>2019-06-16 18:55:24 -0400
commitdb7583cdbb59ef289df7b06fbbd137d1af47821d (patch)
treeab5f76d0127cf4d3e4c1a961048e6a8c9fc005d2
parenta906fe9298bf89e01d5272023db687935068849a (diff)
downloadImageMagick-db7583cdbb59ef289df7b06fbbd137d1af47821d.tar.gz
https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36200
-rw-r--r--ChangeLog4
-rw-r--r--coders/jpeg.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4647a6e24..0e44857bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
https://github.com/ImageMagick/ImageMagick/issues/1391).
* Heap-buffer-overflow in MagickCore/fourier.c (reference
https://github.com/ImageMagick/ImageMagick/issues/1588).
+ * Fixed a number of issues (reference
+ https://imagemagick.org/discourse-server/viewforum.php?f=3).
+ * Fixed a number of issues (reference
+ https://github.com/ImageMagick/ImageMagick/issues).
2019-06-08 7.0.8-49 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 7.0.8-49, GIT revision 15708:6d7e1db:20190608
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 99f005e5b..9db3461c5 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2125,7 +2125,8 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image,
custom_profile),(unsigned int) (length+tag_length+roundup));
}
}
- if (LocaleCompare(name,"XMP") == 0)
+ if ((LocaleCompare(name,"XMP") == 0) &&
+ (GetStringInfoLength(profile) <= 65502))
{
StringInfo
*xmp_profile;