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

!1097 不安全的安全函数封装

Browse Source 
Merge pull request !1097 from 吴岳川/memcpy
This commit is contained in:
opengauss-bot
2021-07-26 02:59:36 +00:00
committed by Gitee
parent d9dc69168f 25d21edf92
commit 7486b123f2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/backend/utils/adt/timestamp.cpp
View File

@ -5777,8 +5777,14 @@ void timestamp_CalculateFields(TimestampTz* dt1, TimestampTz* dt2, fsec_t* fsec,
void WalReplicationTimestampToString(WalReplicationTimestampInfo *timeStampInfo, TimestampTz nowtime,
TimestampTz timeout, TimestampTz lastTimestamp, TimestampTz heartbeat)
{
COPY_AND_CHECK_TIMESTAMP(timeStampInfo->nowTimeStamp, MAXTIMESTAMPLEN + 1, nowtime);
COPY_AND_CHECK_TIMESTAMP(timeStampInfo->timeoutStamp, MAXTIMESTAMPLEN + 1, timeout);
COPY_AND_CHECK_TIMESTAMP(timeStampInfo->lastRecStamp, MAXTIMESTAMPLEN + 1, lastTimestamp);
COPY_AND_CHECK_TIMESTAMP(timeStampInfo->heartbeatStamp, MAXTIMESTAMPLEN + 1, heartbeat);
// timestamptz_to_str returns char[MAXTIMESTAMPLEN + 1]
errno_t rc;
rc = memcpy_s(timeStampInfo->nowTimeStamp, MAXTIMESTAMPLEN + 1, timestamptz_to_str(nowtime), MAXTIMESTAMPLEN + 1);
securec_check(rc, "\0", "\0");
rc = memcpy_s(timeStampInfo->timeoutStamp, MAXTIMESTAMPLEN + 1, timestamptz_to_str(timeout), MAXTIMESTAMPLEN + 1);
securec_check(rc, "\0", "\0");
rc = memcpy_s(timeStampInfo->lastRecStamp, MAXTIMESTAMPLEN + 1, timestamptz_to_str(lastTimestamp), MAXTIMESTAMPLEN + 1);
securec_check(rc, "\0", "\0");
rc = memcpy_s(timeStampInfo->heartbeatStamp, MAXTIMESTAMPLEN + 1, timestamptz_to_str(heartbeat), MAXTIMESTAMPLEN + 1);
securec_check(rc, "\0", "\0");
}

6
src/include/utils/timestamp.h
View File

@ -24,12 +24,6 @@
#define INTERVAL_TYPMOD(p, r) ((((r)&INTERVAL_RANGE_MASK) << 16) | ((p)&INTERVAL_PRECISION_MASK))
#define INTERVAL_PRECISION(t) ((t) & INTERVAL_PRECISION_MASK)
#define INTERVAL_RANGE(t) (((t) >> 16) & INTERVAL_RANGE_MASK)
#define COPY_AND_CHECK_TIMESTAMP(targetTimestamp, size, convertTimeStamp) \
do { \
errno_t rc = memcpy_s(targetTimestamp, size, timestamptz_to_str(convertTimeStamp), size); \
securec_check(rc, "\0", "\0"); \
} while (0)
#ifndef FRONTEND_PARSER
#include "datatype/timestamp.h"