From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 13 Apr 2019 15:04:12 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-41~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0f1ac6c163e149f8884a8a9d33c047709b68c37;p=imagemagick

...
---

diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 6f93bb48a..005333d66 100644
--- a/MagickCore/resource.c
+++ b/MagickCore/resource.c
@@ -1411,6 +1411,8 @@ MagickExport MagickBooleanType SetMagickResourceLimit(const ResourceType type,
       else
         resource_info.height_limit=MagickMin(limit,StringToMagickSizeType(
           value,100.0));
+      resource_info.height_limit=MagickMin(resource_info.height_limit,
+        SSIZE_MAX);
       break;
     }
     case ListLengthResource:
@@ -1487,6 +1489,8 @@ MagickExport MagickBooleanType SetMagickResourceLimit(const ResourceType type,
       else
         resource_info.width_limit=MagickMin(limit,StringToMagickSizeType(value,
           100.0));
+      resource_info.width_limit=MagickMin(resource_info.width_limit,
+        SSIZE_MAX);
       break;
     }
     default:
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 607c73620..3945820e4 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -2019,7 +2019,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
     attributes=(char **) sentinel;
     tag=p;
     c=(*p);
-    if ((isalpha((int) ((unsigned char) *p)) !=0) || (*p == '_') ||
+    if ((isalpha((int) ((unsigned char) *p)) != 0) || (*p == '_') ||
         (*p == ':') || (c < '\0'))
       {
         /*