summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Haas2015-08-06 17:25:45 +0000
committerRobert Haas2015-08-06 17:25:45 +0000
commitdf0a67f754c2c45c99237765f30856c5dd95949d (patch)
tree7fec55ad66734b713b5fa54617df7d989c3f07b0
parent0e141c0fbb211bdd23783afa731e3eef95c9ad7a (diff)
Fix incorrect calculation in shm_mq_receive.
If some, but not all, of the length word has already been read, and the next attempt to read sees exactly the number of bytes needed to complete the length word, or fewer, then we'll incorrectly read less than all of the available data. Antonin Houska
-rw-r--r--src/backend/storage/ipc/shm_mq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c
index 126cb0751b3..e765cea5aaa 100644
--- a/src/backend/storage/ipc/shm_mq.c
+++ b/src/backend/storage/ipc/shm_mq.c
@@ -584,7 +584,7 @@ shm_mq_receive(shm_mq_handle *mqh, Size *nbytesp, void **datap, bool nowait)
if (mqh->mqh_partial_bytes + rb > sizeof(Size))
lengthbytes = sizeof(Size) - mqh->mqh_partial_bytes;
else
- lengthbytes = rb - mqh->mqh_partial_bytes;
+ lengthbytes = rb;
memcpy(&mqh->mqh_buffer[mqh->mqh_partial_bytes], rawdata,
lengthbytes);
mqh->mqh_partial_bytes += lengthbytes;