GraphicsMagick: ReadIPTCProfile(): Fix malformed IPTC data parsing

changeset 16eacf3202e9 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=16eacf3202e9
summary: ReadIPTCProfile(): Fix malformed IPTC data parsing

diffstat:

 ChangeLog                              |   6 ++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/jpeg.c                          |  10 +++++-----
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   8 ++++++++
 5 files changed, 23 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r 684bff5e69e6 -r 16eacf3202e9 ChangeLog
--- a/ChangeLog	Sat Jul 08 12:15:28 2023 -0500
+++ b/ChangeLog	Thu Jul 20 15:38:45 2023 -0500
@@ -1,3 +1,9 @@
+2023-07-20  Bob Friesenhahn  <[email protected]>
+
+	* coders/jpeg.c (ReadIPTCProfile): Fix malformed IPTC data
+	parsing.  SourceForge patch #78 "JPEG: fix malformed IPTC data
+	parsing" by Przemysław Sobala.
+
 2023-07-08  Bob Friesenhahn  <[email protected]>
 
 	* fuzzing/oss-fuzz-build.sh: Fix typo which breaks oss-fuzz build.
diff -r 684bff5e69e6 -r 16eacf3202e9 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sat Jul 08 12:15:28 2023 -0500
+++ b/VisualMagick/installer/inc/version.isx	Thu Jul 20 15:38:45 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230708"
-#define public MagickPackageReleaseDate "snapshot-20230708"
+#define public MagickPackageVersionAddendum ".020230720"
+#define public MagickPackageReleaseDate "snapshot-20230720"
diff -r 684bff5e69e6 -r 16eacf3202e9 coders/jpeg.c
--- a/coders/jpeg.c	Sat Jul 08 12:15:28 2023 -0500
+++ b/coders/jpeg.c	Thu Jul 20 15:38:45 2023 -0500
@@ -848,10 +848,10 @@
     char
       magick[MaxTextExtent];
 
-    for (i=0; i < 10; i++)
+    for (i=0; i < 10 && i < length; i++)
       magick[i]=GetCharacter(jpeg_info);
-    magick[10]='\0';
-    length-=10;
+    magick[i]='\0';
+    length-=i;
     if (LocaleCompare(magick,"Photoshop ") != 0)
       {
         /*
@@ -865,9 +865,9 @@
   /*
     Remove the version number.
   */
-  for (i=0; i < 4; i++)
+  for (i=0; i < 4 && i < length; i++)
     (void) GetCharacter(jpeg_info);
-  length-=4;
+  length-=i;
   tag_length=0;
 #endif
   if (length <= 0)
diff -r 684bff5e69e6 -r 16eacf3202e9 magick/version.h
--- a/magick/version.h	Sat Jul 08 12:15:28 2023 -0500
+++ b/magick/version.h	Thu Jul 20 15:38:45 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230708"
-#define MagickReleaseDate  "snapshot-20230708"
+#define MagickChangeDate   "20230720"
+#define MagickReleaseDate  "snapshot-20230720"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 684bff5e69e6 -r 16eacf3202e9 www/Changelog.html
--- a/www/Changelog.html	Sat Jul 08 12:15:28 2023 -0500
+++ b/www/Changelog.html	Thu Jul 20 15:38:45 2023 -0500
@@ -37,6 +37,14 @@
 </div>
 
 <div class="document">
+<p>2023-07-20  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/jpeg.c (ReadIPTCProfile): Fix malformed IPTC data
+parsing.  SourceForge patch #78 &quot;JPEG: fix malformed IPTC data
+parsing&quot; by Przemysław Sobala.</p></li>
+</ul>
+</blockquote>
 <p>2023-07-08  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">
_______________________________________________
Graphicsmagick-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit