From: dirk <dirk@git.imagemagick.org>
Date: Fri, 4 Apr 2014 20:52:51 +0000 (+0000)
Subject: Bug fixes.
X-Git-Tag: 7.0.1-0~2502
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8adaace42a86b94361b4fdd5295b1741c76a185;p=imagemagick

Bug fixes.
---

diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index ffde3e4bb..7d300022e 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -1557,7 +1557,7 @@ MagickPrivate DIR *NTOpenDirectory(const char *path)
   if (length == 0)
     return((DIR *) NULL);
   if(wcsncat(file_specification,(const wchar_t*) DirectorySeparator,
-       MaxTextExtent) == (wchar_t*)NULL)
+       MaxTextExtent-1) == (wchar_t*)NULL)
     return((DIR *) NULL);
   entry=(DIR *) AcquireMagickMemory(sizeof(DIR));
   if (entry != (DIR *) NULL)
@@ -1568,7 +1568,7 @@ MagickPrivate DIR *NTOpenDirectory(const char *path)
   if (entry->hSearch == INVALID_HANDLE_VALUE)
     {
       if(wcsncat(file_specification,L"*.*",
-        MaxTextExtent) == (wchar_t*)NULL)
+        MaxTextExtent-1) == (wchar_t*)NULL)
         {
           entry=(DIR *) RelinquishMagickMemory(entry);
           return((DIR *) NULL);
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index b7cadf339..f55e5401e 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -2561,7 +2561,7 @@ static char *XMLTreeTagToXML(XMLTreeInfo *xml_info,char **source,size_t *length,
   if ((*length+strlen(xml_info->tag)+MaxTextExtent) > *extent)
     {
       *extent=(*length)+strlen(xml_info->tag)+MaxTextExtent;
-      *source=(char *) ResizeQuantumMemory(*source,*extent,sizeof(*source));
+      *source=(char *) ResizeQuantumMemory(*source,*extent,sizeof(**source));
       if (*source == (char *) NULL)
         return(*source);
     }