database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update src/gausskernel/process/postmaster/pgarch.cpp.

Browse Source 
修复snprintf_s使用不规范导致归档路径错误的问题

Signed-off-by: Cross-罗 <1165977584@qq.com>
This commit is contained in:
Cross-罗
2023-07-19 08:45:05 +00:00
committed by Gitee
parent 4ad5b447f4
commit 58f8b19f9a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gausskernel/process/postmaster/pgarch.cpp
View File

@ -611,6 +611,7 @@ static bool PgarchArchiveXlogToDest(const char* xlog)
int fdDest = -1;
char srcPath[PATH_MAX + 1] = {0};
char destPath[PATH_MAX + 1] = {0};
char archPath[PATH_MAX + 1] = {0};
char activitymsg[MAXFNAMELEN + 16];
long int fileBytes = 0;
int rc = 0;
@ -631,17 +632,17 @@ static bool PgarchArchiveXlogToDest(const char* xlog)
if (retVal == NULL) {
ereport(FATAL, (errmsg_internal("realpath dest %s failed:%m\n", u_sess->attr.attr_storage.XLogArchiveDest)));
}
rc = snprintf_s(destPath, PATH_MAX, PATH_MAX - 1, "%s/%s", destPath, xlog);
rc = snprintf_s(archPath, PATH_MAX, PATH_MAX - 1, "%s/%s", destPath, xlog);
securec_check_ss(rc, "\0", "\0");
if ((fdSrc = open(srcPath, O_RDONLY)) >= 0) {
if ((fdDest = open(destPath, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) >= 0) {
if ((fdDest = open(archPath, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR)) >= 0) {
char pbuff[ARCHIVE_BUF_SIZE] = {0};
while ((fileBytes = read(fdSrc, pbuff, sizeof(pbuff))) > 0) {
if (write(fdDest, pbuff, fileBytes) != fileBytes) {
close(fdSrc);
ereport(FATAL, (errmsg_internal("could not write file\"%s\":%m\n", destPath)));
ereport(FATAL, (errmsg_internal("could not write file\"%s\":%m\n", archPath)));
}
(void)memset_s(pbuff, sizeof(pbuff), 0, sizeof(pbuff));
}
@ -663,7 +664,7 @@ static bool PgarchArchiveXlogToDest(const char* xlog)
return true;
} else {
close(fdSrc);
ereport(FATAL, (errmsg_internal("could not open archive dest file \"%s\":%m\n", destPath)));
ereport(FATAL, (errmsg_internal("could not open archive dest file \"%s\":%m\n", archPath)));
}
} else {
ereport(FATAL, (errmsg_internal("could not open archive src file \"%s\":%m\n", srcPath)));