(no commit message)

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 7960cd3f79bc120641c4cf30dfaae50a94b8c8df..9ab4d95f15efa51739651f1c305d2982e076a9e0 100644 (file)
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -810,6 +810,7 @@ static MagickBooleanType LoadCoderList(const char *xml,const char *filename,
             ResourceLimitError,"MemoryAllocationFailed","`%s'",
             coder_info->magick);
         coder_info=(CoderInfo *) NULL;
+        continue;
       }
     GetMagickToken(q,(const char **) NULL,token);
     if (*token != '=')
@@ -937,7 +938,7 @@ static MagickBooleanType LoadCoderLists(const char *filename,
     if (coder_info == (CoderInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",coder_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","`%s'",p->name);
         continue;
       }
     (void) ResetMagickMemory(coder_info,0,sizeof(*coder_info));

diff --git a/MagickCore/color.c b/MagickCore/color.c
index 8f92263ac9ddaa0a37d9ab966b0eed48d804efeb..6a45629e2bc4e11f14ba42c713787c5223290c70 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -1958,6 +1958,7 @@ static MagickBooleanType LoadColorList(const char *xml,const char *filename,
             ResourceLimitError,"MemoryAllocationFailed","`%s'",
             color_info->name);
         color_info=(ColorInfo *) NULL;
+        continue;
       }
     GetMagickToken(q,(const char **) NULL,token);
     if (*token != '=')
@@ -2100,7 +2101,7 @@ static MagickBooleanType LoadColorLists(const char *filename,
     if (color_info == (ColorInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","`%s'",p->name);
         continue;
       }
     (void) ResetMagickMemory(color_info,0,sizeof(*color_info));

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 2434526c95a72f16b483d0191dac6d4ada68b12c..efd1e1ca2ea39f487068c97351d057196dca3886 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -1161,6 +1161,7 @@ static MagickBooleanType LoadConfigureList(const char *xml,const char *filename,
             ResourceLimitError,"MemoryAllocationFailed","`%s'",
             configure_info->name);
         configure_info=(ConfigureInfo *) NULL;
+        continue;
       }
     /*
       Parse configure element.
@@ -1291,8 +1292,7 @@ static MagickBooleanType LoadConfigureLists(const char *filename,
     if (configure_info == (ConfigureInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",
-          configure_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","`%s'",p->name);
         continue;
       }
     (void) ResetMagickMemory(configure_info,0,sizeof(*configure_info));

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index 978f07ea8d82165ab60eea3db930001fd1250227..cce4df45a657bb34e4cdb61b200f58d3f9e285e5 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -1343,6 +1343,7 @@ static MagickBooleanType LoadDelegateList(const char *xml,const char *filename,
             ResourceLimitError,"MemoryAllocationFailed","`%s'",
             delegate_info->commands);
         delegate_info=(DelegateInfo *) NULL;
+        continue;
       }
     GetMagickToken(q,(const char **) NULL,token);
     if (*token != '=')

diff --git a/MagickCore/log.c b/MagickCore/log.c
index 5029b96b80f399249187896459635ccd62a7eabf..3488609840a827638b479043fc2c1e5045f4db20 100644 (file)
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -1594,7 +1594,7 @@ static MagickBooleanType LoadLogLists(const char *filename,
     if (log_info == (LogInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",log_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","`%s'",p->filename);
         continue;
       }
     (void) ResetMagickMemory(log_info,0,sizeof(*log_info));

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 6a6672fe0e0b12b9d3c302c061cc544afc311357..c4b0a2e8b46e37eb71d6222b223845e7cb3828da 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -792,6 +792,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename,
             ResourceLimitError,"MemoryAllocationFailed","`%s'",
             magic_info->name);
         magic_info=(MagicInfo *) NULL;
+        continue;
       }
     GetMagickToken(q,(const char **) NULL,token);
     if (*token != '=')
@@ -983,7 +984,7 @@ static MagickBooleanType LoadMagicLists(const char *filename,
     if (magic_info == (MagicInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","`%s'",p->name);
         continue;
       }
     (void) ResetMagickMemory(magic_info,0,sizeof(*magic_info));