(no commit message)

diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index bfee1fd40b050673a1e04a383a3c41611ec5ef7e..e4da819112dcfa5699afd8fc2e7b4128f3934e3e 100644 (file)
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -665,6 +665,11 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
   }
   component_view=DestroyCacheView(component_view);
   equivalences=DestroyMatrixInfo(equivalences);
+  if (n > QuantumRange)
+    {
+      component_image=DestroyImage(component_image);
+      ThrowImageException(ResourceLimitError,"TooManyObjects");
+    }
   artifact=GetImageArtifact(image,"connected-components:verbose");
   if (IsStringTrue(artifact) != MagickFalse)
     status=ConnectedComponentsStatistics(image,component_image,(size_t) n,

diff --git a/config/english.xml b/config/english.xml
index 8c8ef786fec26c9193940500eba244cdfa12fe0e..3dee2b581cd9d0cdcb9092b014f4e2d0f16bf89c 100644 (file)
--- a/config/english.xml
+++ b/config/english.xml
@@ -1012,6 +1012,9 @@
           <message name="MemoryAllocationFailed">
             memory allocation failed
           </message>
+          <message name="TooManyObjects">
+            too many objects
+          </message>
           <message name="UnableToAcquireString">
             unable to acquire string
           </message>

diff --git a/config/francais.xml b/config/francais.xml
index 164598637c9e5bb76f73819d232a9680ecc9d8ed..1fdf2f79b511194af745a45eaa3a52654d6f4332 100644 (file)
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -1006,6 +1006,9 @@
           <message name="MemoryAllocationFailed">
             Échec allocation mémoire
           </message>
+          <message name="TooManyObjects">
+            too many objects
+          </message>
           <message name="UnableToAcquireString">
             échec acquisition de la chaine
           </message>