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

Fix shm_mq memcpy bug.

Browse Source
This commit is contained in:
PengJiong
2020-09-17 17:23:35 +08:00
committed by TotaJ
parent e8606ec86d
commit 79c7dca111
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gausskernel/process/postmaster/bgworker.cpp
View File

@ -1065,7 +1065,7 @@ BgwHandleStatus GetBackgroundWorkerPid(const BackgroundWorkerHandle *handle, Thr
/* All done. */
LWLockRelease(BackgroundWorkerLock);
ereport(LOG,
ereport(DEBUG1,
(errmsg("GetBackgroundWorkerPid slot: %d, pid: %lu",
handle->slot, pid)));
if (pid == 0) {

27
src/gausskernel/storage/ipc/shm_mq.cpp
View File

@ -670,22 +670,25 @@ shm_mq_result shm_mq_receive(shm_mq_handle *mqh, Size *nbytesp, void **datap, bo
/* Copy as much as we can. */
Assert(mqh->mqh_partial_bytes + rb <= nbytes);
errno_t rc = memcpy_s(&mqh->mqh_buffer[mqh->mqh_partial_bytes], rb, rawdata, rb);
securec_check(rc, "\0", "\0");
mqh->mqh_partial_bytes += rb;
if (rb != 0) {
errno_t rc = memcpy_s(&mqh->mqh_buffer[mqh->mqh_partial_bytes], rb, rawdata, rb);
securec_check(rc, "\0", "\0");
mqh->mqh_partial_bytes += rb;
/*
* Update count of bytes that can be consumed, accounting for
* alignment padding. Note that this will never actually insert any
* padding except at the end of a message, because the buffer size is
* a multiple of MAXIMUM_ALIGNOF, and each read and write is as well.
*/
Assert(mqh->mqh_partial_bytes == nbytes || rb == MAXALIGN(rb));
mqh->mqh_consume_pending += MAXALIGN(rb);
/*
* Update count of bytes that can be consumed, accounting for
* alignment padding. Note that this will never actually insert any
* padding except at the end of a message, because the buffer size is
* a multiple of MAXIMUM_ALIGNOF, and each read and write is as well.
*/
Assert(mqh->mqh_partial_bytes == nbytes || rb == MAXALIGN(rb));
mqh->mqh_consume_pending += MAXALIGN(rb);
}
/* If we got all the data, exit the loop. */
if (mqh->mqh_partial_bytes >= nbytes)
if (mqh->mqh_partial_bytes >= nbytes) {
break;
}
/* Wait for some more data. */
still_needed = nbytes - mqh->mqh_partial_bytes;