(no commit message)

diff --git a/magick/fx.c b/magick/fx.c
index 5b038c014e220e3bac6e25b12b4a01550b441eb3..7e465de7ecf65f8ccf43157e4fc74ed173900cb6 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -144,6 +144,7 @@ struct _FxInfo
 %  The format of the AcquireFxInfo method is:
 %
 %      FxInfo *AcquireFxInfo(Image *image,const char *expression)
+%
 %  A description of each parameter follows:
 %
 %    o image: the image.
@@ -2301,7 +2302,7 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info,
         exception);
       return(gamma);
     }
-  switch (*expression)
+  switch ((unsigned char) *expression)
   {
     case '+':
     {

diff --git a/magick/string.c b/magick/string.c
index dbbd2d3eb1615a32f740799322e3e6171d244d70..533c96cd53d1369dd613591c6cf3ca0e5565c6af 100644 (file)
--- a/magick/string.c
+++ b/magick/string.c
@@ -2413,8 +2413,9 @@ MagickExport MagickBooleanType SubstituteString(char **string,
       Replace string.
     */
     if (search_extent != replace_extent)
-      (void) memcpy(p+replace_extent,p+search_extent,strlen(p+search_extent)+1);
-    (void) memcpy(p,replace,replace_extent);
+      (void) CopyMagickMemory(p+replace_extent,p+search_extent,
+        strlen(p+search_extent)+1);
+    (void) CopyMagickMemory(p,replace,replace_extent);
     p+=replace_extent-1;
   }
   return(status);