https://github.com/ImageMagick/ImageMagick/issues/966

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 2646e89afb828816089d8a4fda25cda43c6c1a76..bca794191df7e36c15039cc6822d39f195f2db7a 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -13149,7 +13149,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info,
   p=image->directory;
   for (i=tile; (i != 0) && (*p != '\0'); )
   {
-    if (*p == '\n')
+    if (*p == '\377')
       i--;
     p++;
   }
@@ -13259,7 +13259,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info,
           *image_view;
 
         q=p;
-        while ((*q != '\n') && (*q != '\0'))
+        while ((*q != '\377') && (*q != '\0'))
           q++;
         (void) CopyMagickString(filename,p,(size_t) (q-p+1));
         p=q;

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 096c15cbabed94640f97dbb8f5b6b21c186d2a5b..45179dc778437e2fcb7c0b7d0eb0d16d8e448af0 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -1233,7 +1233,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       for (d=image->directory; *d != '\0'; d++)
       {
         q=d;
-        while ((*q != '\n') && (*q != '\0') &&
+        while ((*q != '\377') && (*q != '\0') &&
                ((size_t) (q-d) < sizeof(image_info->filename)))
           q++;
         (void) CopyMagickString(image_info->filename,d,(size_t) (q-d+1));

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 97cb3151425f7131d4d99f2c3e553b9424500416..7c750a3c86dee065503775b9106c4cbe99fc21d7 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -663,7 +663,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
     {
       (void) ConcatenateMagickString(montage->directory,
         image_list[tile]->filename,extent);
-      (void) ConcatenateMagickString(montage->directory,"\n",extent);
+      (void) ConcatenateMagickString(montage->directory,"\377",extent);
       tile++;
     }
     progress_monitor=SetImageProgressMonitor(montage,(MagickProgressMonitor)

diff --git a/coders/html.c b/coders/html.c
index 53a9a0ebe483ce32823b33568376cd5a76e18817..2ed89f909b4345d9ef8937b9c9d537d75bc8ff4c 100644 (file)
--- a/coders/html.c
+++ b/coders/html.c
@@ -334,7 +334,8 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
       (void) FormatLocaleString(buffer,MagickPathExtent,
         "<map id=\"%s\" name=\"%s\">\n",mapname,mapname);
       (void) WriteBlobString(image,buffer);
-      (void) FormatLocaleString(buffer,MagickPathExtent,"  <area href=\"%s",url);
+      (void) FormatLocaleString(buffer,MagickPathExtent,"  <area href=\"%s",
+        url);
       (void) WriteBlobString(image,buffer);
       if (image->directory == (char *) NULL)
         {
@@ -346,7 +347,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
         }
       else
         for (p=image->directory; *p != '\0'; p++)
-          if (*p != '\n')
+          if (*p != '\377')
             (void) WriteBlobByte(image,(unsigned char) *p);
           else
             {
@@ -421,7 +422,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info,
     }
   else
     for (p=image->directory; *p != '\0'; p++)
-      if (*p != '\n')
+      if (*p != '\377')
         (void) WriteBlobByte(image,(unsigned char) *p);
       else
         {

diff --git a/coders/json.c b/coders/json.c
index eda12064f2a8f403ec57d721e0761fc2af61ea71..6ee4b29cc2eaeee4c02d63a19571e82a39621d46 100644 (file)
--- a/coders/json.c
+++ b/coders/json.c
@@ -1502,7 +1502,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
       while (*p != '\0')
       {
         q=p;
-        while ((*q != '\n') && (*q != '\0'))
+        while ((*q != '\377') && (*q != '\0'))
           q++;
         (void) CopyMagickString(image_info->filename,p,(size_t) (q-p+1));
         p=q+1;