Index: /ImageMagick/trunk/coders/png.c =================================================================== --- /ImageMagick/trunk/coders/png.c (revision 7219) +++ /ImageMagick/trunk/coders/png.c (revision 7458) @@ -585,5 +585,5 @@ #endif -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) +#ifdef PNG_SETJMP_NOT_THREAD_SAFE static SemaphoreInfo *ping_semaphore = (SemaphoreInfo *) NULL; @@ -1809,6 +1809,6 @@ static int -Magick_png_read_raw_profile(Image *image, const ImageInfo *image_info, - png_textp text,int ii,ExceptionInfo *exception) +Magick_png_read_raw_profile(png_struct *ping,Image *image, + const ImageInfo *image_info, png_textp text,int ii,ExceptionInfo *exception) { register ssize_t @@ -1856,6 +1856,5 @@ if (length == 0) { - (void) ThrowMagickException(exception,GetMagickModule(), - CoderWarning,"UnableToCopyProfile","`%s'","invalid profile length"); + png_warning(ping,"invalid profile length"); return(MagickFalse); } @@ -1865,7 +1864,5 @@ if (profile == (StringInfo *) NULL) { - (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", - "unable to copy profile"); + png_warning(ping, "unable to copy profile"); return(MagickFalse); } @@ -1881,6 +1878,5 @@ if (*sp == '\0') { - (void) ThrowMagickException(exception,GetMagickModule(), - CoderWarning,"UnableToCopyProfile","`%s'","ran out of data"); + png_warning(ping, "ran out of profile data"); profile=DestroyStringInfo(profile); return(MagickFalse); @@ -2086,8 +2082,4 @@ logging=LogMagickEvent(CoderEvent,GetMagickModule(), " Enter ReadOnePNGImage()"); - -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - LockSemaphoreInfo(ping_semaphore); -#endif #if (PNG_LIBPNG_VER < 10200) @@ -2166,7 +2158,12 @@ */ png_destroy_read_struct(&ping,&ping_info,&end_info); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) + +#ifdef PNG_SETJMP_NOT_THREAD_SAFE UnlockSemaphoreInfo(ping_semaphore); #endif + + if (ping_pixels != (unsigned char *) NULL) + ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels); + if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -2181,4 +2178,14 @@ return(GetFirstImageInList(image)); } + + /* { For navigation to end of SETJMP-protected block. Within this + * block, use png_error() instead of Throwing an Exception, to ensure + * that libpng is able to clean up, and that the semaphore is unlocked. + */ + +#ifdef PNG_SETJMP_NOT_THREAD_SAFE + LockSemaphoreInfo(ping_semaphore); +#endif + /* Prepare PNG for reading. @@ -2315,13 +2322,13 @@ profile=BlobToStringInfo(info,profile_length); if (profile == (StringInfo *) NULL) - { - (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", - "unable to copy profile"); - return((Image *) NULL); - } - SetStringInfoDatum(profile,(const unsigned char *) info); - (void) SetImageProfile(image,"icc",profile,exception); - profile=DestroyStringInfo(profile); + { + png_warning(ping, "ICC profile is NULL"); + profile=DestroyStringInfo(profile); + } + else + { + (void) SetImageProfile(image,"icc",profile,exception); + profile=DestroyStringInfo(profile); + } } } @@ -2470,15 +2477,16 @@ if (!png_get_valid(ping,ping_info,PNG_INFO_tRNS)) + { if (mng_info->global_trns_length) { - if (mng_info->global_trns_length > - mng_info->global_plte_length) - (void) ThrowMagickException(exception, - GetMagickModule(),CoderError, - "global tRNS has more entries than global PLTE", - "`%s'",image_info->filename); - png_set_tRNS(ping,ping_info,mng_info->global_trns, - (int) mng_info->global_trns_length,NULL); + png_warning(ping, + "global tRNS has more entries than global PLTE"); } + else + { + png_set_tRNS(ping,ping_info,mng_info->global_trns, + (int) mng_info->global_trns_length,NULL); + } + } #ifdef PNG_READ_bKGD_SUPPORTED if ( @@ -2515,7 +2523,5 @@ } else - (void) ThrowMagickException(exception,GetMagickModule(), - CoderError,"No global PLTE in file","`%s'", - image_info->filename); + png_error(ping,"No global PLTE in file"); } } @@ -2732,5 +2738,5 @@ */ if (AcquireImageColormap(image,image->colors,exception) == MagickFalse) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + png_error(ping,"Memory allocation failed"); if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE) @@ -2820,7 +2826,9 @@ mng_info->scenes_found-1); png_destroy_read_struct(&ping,&ping_info,&end_info); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) + +#ifdef PNG_SETJMP_NOT_THREAD_SAFE UnlockSemaphoreInfo(ping_semaphore); #endif + if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -2843,5 +2851,5 @@ if (ping_pixels == (unsigned char *) NULL) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + png_error(ping,"Memory allocation failed"); if (logging != MagickFalse) @@ -2851,36 +2859,8 @@ Convert PNG pixels to pixel packets. */ - if (setjmp(png_jmpbuf(ping))) - { - /* - PNG image is corrupt. - */ - png_destroy_read_struct(&ping,&ping_info,&end_info); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - UnlockSemaphoreInfo(ping_semaphore); -#endif - if (quantum_info != (QuantumInfo *) NULL) - quantum_info = DestroyQuantumInfo(quantum_info); - - if (ping_pixels != (unsigned char *) NULL) - ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels); - - if (logging != MagickFalse) - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " exit ReadOnePNGImage() with error."); - - if (image != (Image *) NULL) - { - InheritException(exception,exception); - image->columns=0; - } - - return(GetFirstImageInList(image)); - } - quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + png_error(ping,"Failed to allocate quantum_info"); { @@ -3027,5 +3007,5 @@ if (quantum_scanline == (Quantum *) NULL) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + png_error(ping,"Memory allocation failed"); for (y=0; y < (ssize_t) image->rows; y++) @@ -3254,5 +3234,5 @@ image->colors=2; (void) SetImageBackgroundColor(image,exception); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) +#ifdef PNG_SETJMP_NOT_THREAD_SAFE UnlockSemaphoreInfo(ping_semaphore); #endif @@ -3371,6 +3351,6 @@ if (memcmp(text[i].key, "Raw profile type ",17) == 0) { - (void) Magick_png_read_raw_profile(image,image_info,text,(int) i, - exception); + (void) Magick_png_read_raw_profile(ping,image,image_info,text, + (int) i,exception); num_raw_profiles++; } @@ -3386,7 +3366,5 @@ if (value == (char *) NULL) { - (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", - image->filename); + png_error(ping,"Memory allocation failed"); break; } @@ -3441,12 +3419,8 @@ { if (mng_info->ob[object_id] == (MngBuffer *) NULL) - (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", - image->filename); + png_error(ping,"Memory allocation failed"); if (mng_info->ob[object_id]->frozen) - (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"Cannot overwrite frozen MNG object buffer", - "`%s'",image->filename); + png_error(ping,"Cannot overwrite frozen MNG object buffer"); } @@ -3465,7 +3439,5 @@ else - (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"Cloning image for object buffer failed", - "`%s'",image->filename); + png_error(ping, "Cloning image for object buffer failed"); if (ping_width > 250000L || ping_height > 250000L) @@ -3622,11 +3594,16 @@ ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - UnlockSemaphoreInfo(ping_semaphore); -#endif if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " exit ReadOnePNGImage()"); + +#ifdef PNG_SETJMP_NOT_THREAD_SAFE + UnlockSemaphoreInfo(ping_semaphore); +#endif + + /* } for navigation to beginning of SETJMP-protected block, revert to + * Throwing an Exception when an error occurs. + */ return(image); @@ -4994,5 +4971,5 @@ { /* - Instead ofsuing a warning we should allocate a larger + Instead of using a warning we should allocate a larger MngInfo structure and continue. */ @@ -7208,5 +7185,5 @@ (void) RegisterMagickInfo(entry); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) +#ifdef PNG_SETJMP_NOT_THREAD_SAFE ping_semaphore=AllocateSemaphoreInfo(); #endif @@ -7243,5 +7220,5 @@ (void) UnregisterMagickInfo("JNG"); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) +#ifdef PNG_SETJMP_NOT_THREAD_SAFE if (ping_semaphore != (SemaphoreInfo *) NULL) DestroySemaphoreInfo(&ping_semaphore); @@ -7592,8 +7569,4 @@ if (image_info == (ImageInfo *) NULL) ThrowWriterException(ResourceLimitError, "MemoryAllocationFailed"); - -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - LockSemaphoreInfo(ping_semaphore); -#endif /* Initialize some stuff */ @@ -8875,7 +8848,4 @@ "Cannot write PNG8 or color-type 3; colormap is NULL", "`%s'",IMimage->filename); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - UnlockSemaphoreInfo(ping_semaphore); -#endif return(MagickFalse); } @@ -8920,7 +8890,14 @@ #endif png_destroy_write_struct(&ping,&ping_info); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) +#ifdef PNG_SETJMP_NOT_THREAD_SAFE UnlockSemaphoreInfo(ping_semaphore); #endif + + if (ping_pixels != (unsigned char *) NULL) + ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels); + + if (quantum_info != (QuantumInfo *) NULL) + quantum_info=DestroyQuantumInfo(quantum_info); + if (ping_have_blob != MagickFalse) (void) CloseBlob(image); @@ -8929,4 +8906,14 @@ return(MagickFalse); } + + /* { For navigation to end of SETJMP-protected block. Within this + * block, use png_error() instead of Throwing an Exception, to ensure + * that libpng is able to clean up, and that the semaphore is unlocked. + */ + +#ifdef PNG_SETJMP_NOT_THREAD_SAFE + LockSemaphoreInfo(ping_semaphore); +#endif + /* Prepare PNG for writing. @@ -9283,7 +9270,5 @@ { /* DO SOMETHING */ - (void) ThrowMagickException(exception, - GetMagickModule(),CoderError, - "image has 0 colors", "`%s'",""); + png_error(ping,"image has 0 colors"); } @@ -10311,35 +10296,12 @@ if (ping_pixels == (unsigned char *) NULL) - ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); + png_error(ping,"Allocation of memory for pixels failed"); /* Initialize image scanlines. */ - if (setjmp(png_jmpbuf(ping))) - { - /* - PNG write failed. - */ -#ifdef PNG_DEBUG - if (image_info->verbose) - (void) printf("PNG write has failed.\n"); -#endif - png_destroy_write_struct(&ping,&ping_info); - if (quantum_info != (QuantumInfo *) NULL) - quantum_info=DestroyQuantumInfo(quantum_info); - if (ping_pixels != (unsigned char *) NULL) - ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - UnlockSemaphoreInfo(ping_semaphore); -#endif - if (ping_have_blob != MagickFalse) - (void) CloseBlob(image); - image_info=DestroyImageInfo(image_info); - image=DestroyImage(image); - return(MagickFalse); - } quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) - ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); + png_error(ping,"Memory allocation for quantum_info failed"); quantum_info->format=UndefinedQuantumFormat; quantum_info->depth=image_depth; @@ -10757,7 +10719,5 @@ if (mng_info->write_mng && !mng_info->need_fram && ((int) image->dispose == 3)) - (void) ThrowMagickException(exception,GetMagickModule(), - CoderError,"Cannot convert GIF with disposal method 3 to MNG-LC", - "`%s'",image->filename); + png_error(ping, "Cannot convert GIF with disposal method 3 to MNG-LC"); /* @@ -10769,8 +10729,4 @@ ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels); -#if defined(PNG_SETJMP_NOT_THREAD_SAFE) - UnlockSemaphoreInfo(ping_semaphore); -#endif - if (ping_have_blob != MagickFalse) (void) CloseBlob(image); @@ -10789,6 +10745,15 @@ " exit WriteOnePNGImage()"); +#ifdef PNG_SETJMP_NOT_THREAD_SAFE + UnlockSemaphoreInfo(ping_semaphore); +#endif + + /* } for navigation to beginning of SETJMP-protected block. Revert to + * Throwing an Exception when an error occurs. + */ + return(MagickTrue); /* End write one PNG image */ + }