Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit929c057

Browse files
committed
Don't allocate large buffer on the stack in pg_verifybackup
Per complaint from Andres Freund. Follow his suggestion to allocate thebuffer once in the calling routine instead.Also make a tiny indentation improvement.Discussion:https://postgr.es/m/20240411190147.a3yries632olfcgg@awork3.anarazel.de
1 parent42fa4b6 commit929c057

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

‎src/bin/pg_verifybackup/pg_verifybackup.c‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ static void verify_control_file(const char *controlpath,
144144
staticvoidreport_extra_backup_files(verifier_context*context);
145145
staticvoidverify_backup_checksums(verifier_context*context);
146146
staticvoidverify_file_checksum(verifier_context*context,
147-
manifest_file*m,char*fullpath);
147+
manifest_file*m,char*fullpath,
148+
uint8*buffer);
148149
staticvoidparse_required_wal(verifier_context*context,
149150
char*pg_waldump_path,
150151
char*wal_directory);
@@ -480,8 +481,8 @@ parse_manifest_file(char *manifest_path)
480481
(long longint)statbuf.st_size);
481482
}
482483
bytes_left-=rc;
483-
json_parse_manifest_incremental_chunk(
484-
inc_state,buffer,rc,bytes_left==0);
484+
json_parse_manifest_incremental_chunk(inc_state,buffer,rc,
485+
bytes_left==0);
485486
}
486487

487488
/* Release the incremental state memory */
@@ -812,9 +813,12 @@ verify_backup_checksums(verifier_context *context)
812813
manifest_data*manifest=context->manifest;
813814
manifest_files_iteratorit;
814815
manifest_file*m;
816+
uint8*buffer;
815817

816818
progress_report(false);
817819

820+
buffer=pg_malloc(READ_CHUNK_SIZE*sizeof(uint8));
821+
818822
manifest_files_start_iterate(manifest->files,&it);
819823
while ((m=manifest_files_iterate(manifest->files,&it))!=NULL)
820824
{
@@ -828,13 +832,15 @@ verify_backup_checksums(verifier_context *context)
828832
m->pathname);
829833

830834
/* Do the actual checksum verification. */
831-
verify_file_checksum(context,m,fullpath);
835+
verify_file_checksum(context,m,fullpath,buffer);
832836

833837
/* Avoid leaking memory. */
834838
pfree(fullpath);
835839
}
836840
}
837841

842+
pfree(buffer);
843+
838844
progress_report(true);
839845
}
840846

@@ -843,14 +849,13 @@ verify_backup_checksums(verifier_context *context)
843849
*/
844850
staticvoid
845851
verify_file_checksum(verifier_context*context,manifest_file*m,
846-
char*fullpath)
852+
char*fullpath,uint8*buffer)
847853
{
848854
pg_checksum_contextchecksum_ctx;
849855
char*relpath=m->pathname;
850856
intfd;
851857
intrc;
852858
size_tbytes_read=0;
853-
uint8buffer[READ_CHUNK_SIZE];
854859
uint8checksumbuf[PG_CHECKSUM_MAX_LENGTH];
855860
intchecksumlen;
856861

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp