(no commit message)

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 250989323a82c2b279fa2a92de70973a87e62cb6..327e23f422e8f8a3174ccc4675784e95be5370bf 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -8414,7 +8414,7 @@ MagickPrivate void XMakeWindow(Display *display,Window parent,char **argv,
         if ((isspace((int) ((unsigned char) *p)) == 0) && (*p != '%'))
           p++;
         else
-          (void) CopyMagickString(p,p+1,MaxTextExtent);
+          (void) CopyMagickString(p,p+1,MaxTextExtent-(p-geometry));
       }
       flags=XWMGeometry(display,window_info->screen,geometry,default_geometry,
         window_info->border_width,size_hints,&size_hints->x,&size_hints->y,

diff --git a/coders/dds.c b/coders/dds.c
index 9e2a4c327a52657a874b1046793aac11fd48b03a..f91f3cc6cb0dae9249797be9f0df757d2a0e1771 100644 (file)
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -2729,7 +2729,7 @@ static void WriteDDSInfo(Image *image, const size_t pixelFormat,
   (void) WriteBlobLSBLong(image,0x00);
   (void) WriteBlobLSBLong(image,(unsigned int) mipmaps+1);
   (void) ResetMagickMemory(software,0,sizeof(software));
-  (void) strcpy(software,"IMAGEMAGICK");
+  (void) CopyMagickString(software,"IMAGEMAGICK",MaxTextExtent);
   (void) WriteBlob(image,44,(unsigned char *) software);
 
   (void) WriteBlobLSBLong(image,32);