mirror of
				https://github.com/postgres/postgres.git
				synced 2025-10-31 00:03:57 -04:00 
			
		
		
		
	Fix thinko in assertion in basebackup.c.
Commit 5a1007a5088cd6ddf892f7422ea8dbaef362372f tried to introduce an assertion that the block size was at least twice the size of a tar block, but I got the math wrong. My error was reported to me off-list.
This commit is contained in:
		
							parent
							
								
									a27048cbcb
								
							
						
					
					
						commit
						10eae82b27
					
				| @ -376,7 +376,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink) | |||||||
| 			else | 			else | ||||||
| 			{ | 			{ | ||||||
| 				/* Properly terminate the tarfile. */ | 				/* Properly terminate the tarfile. */ | ||||||
| 				StaticAssertStmt(TAR_BLOCK_SIZE <= 2 * BLCKSZ, | 				StaticAssertStmt(2 * TAR_BLOCK_SIZE <= BLCKSZ, | ||||||
| 								 "BLCKSZ too small for 2 tar blocks"); | 								 "BLCKSZ too small for 2 tar blocks"); | ||||||
| 				memset(sink->bbs_buffer, 0, 2 * TAR_BLOCK_SIZE); | 				memset(sink->bbs_buffer, 0, 2 * TAR_BLOCK_SIZE); | ||||||
| 				bbsink_archive_contents(sink, 2 * TAR_BLOCK_SIZE); | 				bbsink_archive_contents(sink, 2 * TAR_BLOCK_SIZE); | ||||||
| @ -621,7 +621,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink) | |||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		/* Properly terminate the tar file. */ | 		/* Properly terminate the tar file. */ | ||||||
| 		StaticAssertStmt(TAR_BLOCK_SIZE <= 2 * BLCKSZ, | 		StaticAssertStmt(2 * TAR_BLOCK_SIZE <= BLCKSZ, | ||||||
| 						 "BLCKSZ too small for 2 tar blocks"); | 						 "BLCKSZ too small for 2 tar blocks"); | ||||||
| 		memset(sink->bbs_buffer, 0, 2 * TAR_BLOCK_SIZE); | 		memset(sink->bbs_buffer, 0, 2 * TAR_BLOCK_SIZE); | ||||||
| 		bbsink_archive_contents(sink, 2 * TAR_BLOCK_SIZE); | 		bbsink_archive_contents(sink, 2 * TAR_BLOCK_SIZE); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user