(no commit message)

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index da37fe29b5ec3a5b3da4560548608bf2e00cae2a..c531516110ac9868d866cc6ca264f1f5a4cb18bb 100644 (file)
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -770,6 +770,7 @@ static MagickBooleanType LoadPolicyList(const char *xml,const char *filename,
             ResourceLimitError,"MemoryAllocationFailed","`%s'",
             policy_info->name);
         policy_info=(PolicyInfo *) NULL;
+        continue;
       }
     GetMagickToken(q,(const char **) NULL,token);
     if (*token != '=')
@@ -928,7 +929,7 @@ static MagickBooleanType LoadPolicyLists(const char *filename,
     if (policy_info == (PolicyInfo *) NULL)
       {
         (void) ThrowMagickException(exception,GetMagickModule(),
-          ResourceLimitError,"MemoryAllocationFailed","`%s'",policy_info->name);
+          ResourceLimitError,"MemoryAllocationFailed","`%s'",p->name);
         continue;
       }
     (void) ResetMagickMemory(policy_info,0,sizeof(*policy_info));

diff --git a/MagickCore/type.c b/MagickCore/type.c
index a79c27c3ccc39733a2372f8ad0c477b5b4561920..8e8f79d03f9af68945f5d5ccd74bd6e77a27fbd1 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -1094,6 +1094,7 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename,
           (void) ThrowMagickException(exception,GetMagickModule(),
             ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name);
         type_info=(TypeInfo *) NULL;
+        continue;
       }
     GetMagickToken(q,(const char **) NULL,token);
     if (*token != '=')

diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c
index 273a5360f7f6c8e1014ed9c683269b50d4f963c7..ef8e5f366da377e9010e8e2593a83150c10fbb0f 100644 (file)
--- a/MagickWand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -5504,7 +5504,7 @@ WandExport MagickBooleanType DrawSetStrokeDashArray(DrawingWand *wand,
         {
           CurrentContext->dash_pattern=(double *) AcquireQuantumMemory((size_t)
             n_new+1UL,sizeof(*CurrentContext->dash_pattern));
-          if (!CurrentContext->dash_pattern)
+          if (CurrentContext->dash_pattern == (double *) NULL)
             {
               ThrowDrawException(ResourceLimitError,"MemoryAllocationFailed",
                 wand->name);

diff --git a/coders/pcd.c b/coders/pcd.c
index 62e16a98d3cfc1a1c66bff902e422e1a29a3e0b1..5be0291849a3cf25e4be201c132f40b212e1fd79 100644 (file)
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -191,7 +191,10 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
   bits=32;
   p=buffer+0x800;
   for (i=0; i < 3; i++)
+  {
     pcd_table[i]=(PCDTable *) NULL;
+    pcd_length=0;
+  }
   for (i=0; i < (image->columns > 1536 ? 3 : 1); i++)
   {
     PCDGetBits(8);