Changeset 71

Show
Ignore:
Timestamp:
09/11/09 19:12:36 (6 months ago)
Author:
cristy
Message:
 
Location:
ImageMagick/trunk
Files:
12 modified

Legend:

Unmodified
Added
Removed

  • ImageMagick/trunk/coders/gray.c

    r1 r71  
    247247    } 
    248248    SetQuantumImageType(image,quantum_type); 
     249    if (EOFBlob(image) != MagickFalse) 
     250      { 
     251        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", 
     252          image->filename); 
     253        break; 
     254      } 
    249255    /* 
    250256      Proceed to next image. 

  • ImageMagick/trunk/coders/rgb.c

    r1 r71  
    561561    } 
    562562    SetQuantumImageType(image,quantum_type); 
     563    if (EOFBlob(image) != MagickFalse) 
     564      { 
     565        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", 
     566          image->filename); 
     567        break; 
     568      } 
    563569    /* 
    564570      Proceed to next image. 

  • ImageMagick/trunk/coders/ycbcr.c

    r1 r71  
    788788    } 
    789789    SetQuantumImageType(image,quantum_type); 
     790    if (EOFBlob(image) != MagickFalse) 
     791      { 
     792        ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", 
     793          image->filename); 
     794        break; 
     795      } 
    790796    /* 
    791797      Proceed to next image. 

  • ImageMagick/trunk/version.sh

    r70 r71  
    1313PACKAGE_VERSION='6.5.5' 
    1414PACKAGE_LIB_VERSION="0x655" 
    15 PACKAGE_RELEASE="10" 
     15PACKAGE_RELEASE="9" 
    1616PACKAGE_LIB_VERSION_NUMBER="6,5,5,${PACKAGE_RELEASE}" 
    1717PACKAGE_RELEASE_DATE=`date +%F` 

  • ImageMagick/trunk/wand/animate.c

    r1 r71  
    14121412    ThrowAnimateException(OptionError,"MissingAnImageFilename",argv[argc-1]) 
    14131413  FinalizeImageSettings(image_info,image,MagickTrue); 
     1414  if (image == (Image *) NULL) 
     1415    ThrowAnimateException(OptionError,"MissingAnImageFilename",argv[argc-1]) 
    14141416  if (resource_info.window_id != (char *) NULL) 
    14151417    { 

  • ImageMagick/trunk/wand/compare.c

    r1 r71  
    903903    ThrowCompareException(OptionError,"MissingAnImageFilename",argv[i]); 
    904904  FinalizeImageSettings(image_info,image,MagickTrue); 
     905  if ((image == (Image *) NULL) || (GetImageListLength(image) < 2)) 
     906    ThrowCompareException(OptionError,"MissingAnImageFilename",argv[i]); 
    905907  image=GetImageFromList(image,0); 
    906908  reconstruct_image=GetImageFromList(image,1); 

  • ImageMagick/trunk/wand/composite.c

    r1 r71  
    15931593    ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]); 
    15941594  FinalizeImageSettings(image_info,image,MagickTrue); 
     1595  if ((image == (Image *) NULL) || (GetImageListLength(image) < 2)) 
     1596    ThrowCompositeException(OptionError,"MissingAnImageFilename",argv[argc-1]); 
    15951597  /* 
    15961598    Composite images. 

  • ImageMagick/trunk/wand/convert.c

    r3 r71  
    28192819    ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); 
    28202820  FinalizeImageSettings(image_info,image,MagickTrue); 
     2821  if (image == (Image *) NULL) 
     2822    ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); 
    28212823  status&=WriteImages(image_info,image,argv[argc-1],exception); 
    28222824  if (metadata != (char **) NULL) 

  • ImageMagick/trunk/wand/mogrify-private.h

    r1 r71  
    4141  ResetImageOptions(image_info); \ 
    4242  FireImageStack(MagickTrue,advance,MagickTrue); \ 
    43   (void) SyncImagesSettings(image_info,image); \ 
     43  if (image != (Image *) NULL) \ 
     44    (void) SyncImagesSettings(image_info,image); \ 
    4445} 
    4546#define FireImageStack(postfix,advance,fire) \ 

  • ImageMagick/trunk/wand/mogrify.c

    r14 r71  
    72057205  for (i=0; i < (long) argc; i++) 
    72067206  { 
     7207if (*images == (Image *) NULL) 
     7208  break; 
    72077209    option=argv[i]; 
    72087210    if (IsMagickOption(option) == MagickFalse) 

  • ImageMagick/trunk/wand/montage.c

    r1 r71  
    16671667    ThrowMontageException(OptionError,"MissingAnImageFilename",argv[argc-1]); 
    16681668  FinalizeImageSettings(image_info,image,MagickTrue); 
     1669  if (image == (Image *) NULL) 
     1670    ThrowMontageException(OptionError,"MissingAnImageFilename",argv[argc-1]); 
    16691671  (void) CopyMagickString(montage_info->filename,argv[argc-1],MaxTextExtent); 
    16701672  montage_image=MontageImageList(image_info,montage_info,image,exception); 

  • ImageMagick/trunk/wand/stream.c

    r1 r71  
    741741    ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]); 
    742742  FinalizeImageSettings(image_info,image,MagickTrue); 
     743  if (image == (Image *) NULL) 
     744    ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]); 
    743745  DestroyStream(); 
    744746  return(status != 0 ? MagickTrue : MagickFalse);