mirror of
				https://git.code.sf.net/p/libpng/code.git
				synced 2025-07-10 18:04:09 +02:00 
			
		
		
		
	[libpng15] Always set the "safe" limits in pngconf.h when SAFE_LIMITS is
even if pnglibconf.h has been edited to remove the limits.
This commit is contained in:
		
							parent
							
								
									97b6ad1c06
								
							
						
					
					
						commit
						f97ed91ead
					
				
							
								
								
									
										11
									
								
								pngconf.h
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								pngconf.h
									
									
									
									
									
								
							@ -26,20 +26,23 @@
 | 
				
			|||||||
#ifdef PNG_SAFE_LIMITS_SUPPORTED
 | 
					#ifdef PNG_SAFE_LIMITS_SUPPORTED
 | 
				
			||||||
#  ifdef PNG_USER_WIDTH_MAX
 | 
					#  ifdef PNG_USER_WIDTH_MAX
 | 
				
			||||||
#    undef PNG_USER_WIDTH_MAX
 | 
					#    undef PNG_USER_WIDTH_MAX
 | 
				
			||||||
#    define PNG_USER_WIDTH_MAX 1000000L
 | 
					 | 
				
			||||||
#  endif
 | 
					#  endif
 | 
				
			||||||
 | 
					#  define PNG_USER_WIDTH_MAX 1000000L
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#  ifdef PNG_USER_HEIGHT_MAX
 | 
					#  ifdef PNG_USER_HEIGHT_MAX
 | 
				
			||||||
#    undef PNG_USER_HEIGHT_MAX
 | 
					#    undef PNG_USER_HEIGHT_MAX
 | 
				
			||||||
#    define PNG_USER_HEIGHT_MAX 1000000L
 | 
					 | 
				
			||||||
#  endif
 | 
					#  endif
 | 
				
			||||||
 | 
					#  define PNG_USER_HEIGHT_MAX 1000000L
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#  ifdef PNG_USER_CHUNK_MALLOC_MAX
 | 
					#  ifdef PNG_USER_CHUNK_MALLOC_MAX
 | 
				
			||||||
#    undef PNG_USER_CHUNK_MALLOC_MAX
 | 
					#    undef PNG_USER_CHUNK_MALLOC_MAX
 | 
				
			||||||
#    define PNG_USER_CHUNK_MALLOC_MAX 4000000L
 | 
					 | 
				
			||||||
#  endif
 | 
					#  endif
 | 
				
			||||||
 | 
					#  define PNG_USER_CHUNK_MALLOC_MAX 4000000L
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#  ifdef PNG_USER_CHUNK_CACHE_MAX
 | 
					#  ifdef PNG_USER_CHUNK_CACHE_MAX
 | 
				
			||||||
#    undef PNG_USER_CHUNK_CACHE_MAX
 | 
					#    undef PNG_USER_CHUNK_CACHE_MAX
 | 
				
			||||||
#    define PNG_USER_CHUNK_CACHE_MAX 128
 | 
					 | 
				
			||||||
#  endif
 | 
					#  endif
 | 
				
			||||||
 | 
					#  define PNG_USER_CHUNK_CACHE_MAX 128
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef PNG_BUILDING_SYMBOL_TABLE
 | 
					#ifndef PNG_BUILDING_SYMBOL_TABLE
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user