From 94379d88b32bfb922d6e485c1f8dbf55ea4e7465 Mon Sep 17 00:00:00 2001 From: Jesse Wang Date: Tue, 25 Jul 2023 11:07:29 +1200 Subject: [PATCH] fix(postgres): fix buffer management in PgCopyIn.read_from (#2630) --- sqlx-core/src/net/socket/buffered.rs | 2 +- sqlx-postgres/src/copy.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sqlx-core/src/net/socket/buffered.rs b/sqlx-core/src/net/socket/buffered.rs index 3dd5f641..7a314d29 100644 --- a/sqlx-core/src/net/socket/buffered.rs +++ b/sqlx-core/src/net/socket/buffered.rs @@ -151,7 +151,7 @@ impl WriteBuffer { self.buf.truncate(self.bytes_written); self.buf.extend_from_slice(slice); } - + self.advance(slice.len()); self.sanity_check(); } diff --git a/sqlx-postgres/src/copy.rs b/sqlx-postgres/src/copy.rs index 62078430..f5a6ea85 100644 --- a/sqlx-postgres/src/copy.rs +++ b/sqlx-postgres/src/copy.rs @@ -229,7 +229,7 @@ impl> PgCopyIn { let buf = conn.stream.write_buffer_mut(); // CopyData format code and reserved space for length - buf.put_slice(b"d\0\0\0\0"); + buf.put_slice(b"d\0\0\0\x04"); let read = match () { // Tokio lets us read into the buffer without zeroing first