From 326182d587fc1b1a8c934dafbf412d05615a540a Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 18 May 2014 21:48:30 +0000
Subject: [PATCH]

---
 MagickCore/token.c | 4 ++++
 coders/meta.c      | 7 +++++--
 coders/psd.c       | 4 ++--
 coders/uil.c       | 1 -
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/MagickCore/token.c b/MagickCore/token.c
index 57fda386a..88d3031f9 100644
--- a/MagickCore/token.c
+++ b/MagickCore/token.c
@@ -961,7 +961,11 @@ MagickExport int Tokenizer(TokenInfo *token_info,const unsigned flag,
     switch (token_info->state)
     {
       case IN_WHITE:
+      {
         token_info->state=IN_TOKEN;
+        StoreToken(token_info,token,max_token_length,c);
+        break;
+      }
       case IN_TOKEN:
       case IN_QUOTE:
       {
diff --git a/coders/meta.c b/coders/meta.c
index 7e5d51b3a..c9027bdac 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1842,9 +1842,12 @@ static int formatIPTC(Image *ifile, Image *ofile)
     else
       {
         if (foundiptc)
-          return -1;
+          return(-1);
         else
-          continue;
+          {
+            c=0;
+            continue;
+          }
       }
 
     /* we found the 0x1c tag and now grab the dataset and record number tags */
diff --git a/coders/psd.c b/coders/psd.c
index e99a27807..97a2684bd 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1188,7 +1188,7 @@ static MagickStatusType ReadPSDLayers(Image *image,const ImageInfo *image_info,
       count=ReadBlob(image,4,(unsigned char *) type);
       if ((count == 0) || (LocaleNCompare(type,"8BIM",4) != 0))
         {
-          if (DiscardBlobBytes(image,size-quantum-8) == MagickFalse)
+          if (DiscardBlobBytes(image,size-(ssize_t) quantum-8) == MagickFalse)
             ThrowFileException(exception,CorruptImageError,
               "UnexpectedEndOfFile",image->filename);
         }
@@ -1198,7 +1198,7 @@ static MagickStatusType ReadPSDLayers(Image *image,const ImageInfo *image_info,
           if ((count != 0) && (LocaleNCompare(type,"Lr16",4) == 0))
             size=GetPSDSize(psd_info,image);
           else
-            if (DiscardBlobBytes(image,size-quantum-12) == MagickFalse)
+            if (DiscardBlobBytes(image,size-(ssize_t) quantum-12) == MagickFalse)
               ThrowFileException(exception,CorruptImageError,
                 "UnexpectedEndOfFile",image->filename);
         }
diff --git a/coders/uil.c b/coders/uil.c
index 6811499b1..8496adee3 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -274,7 +274,6 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image,
             {
               if (matte_image[i] != 0)
                 SetPixelIndex(image,image->colors,q);
-              p++;
               q+=GetPixelChannels(image);
             }
           }
-- 
2.40.0