database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-12 21:01:52 +03:00
Code Activity

Relocate a badly placed Assert in COPY FROM code

Browse Source 
There's not much point in asserting a pointer isn't NULL after some code
has already dereferenced that pointer.

Adjust the code so that the Assert occurs before the pointer dereference.

The Assert probably has questionable value in the first place, but it
seems worth keeping around to document the contract between
CopyMultiInsertInfoNextFreeSlot() and its callers.

Author: Amul Sul <sulamul@gmail.com>
Discussion: https://postgr.es/m/CAAJ_b94hXQzXaJxTLShkxQUgezf_SUxhzX9TH2f-g6gP7bne7g@mail.gmail.com
This commit is contained in:
David Rowley
2024-08-17 10:36:23 +12:00
parent 1d80d6b50e
commit bd8fe12ef3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/commands/copyfrom.c
View File

@ -597,10 +597,12 @@ CopyMultiInsertInfoNextFreeSlot(CopyMultiInsertInfo *miinfo,
ResultRelInfo *rri) ResultRelInfo *rri)
{ {
CopyMultiInsertBuffer *buffer = rri->ri_CopyMultiInsertBuffer; CopyMultiInsertBuffer *buffer = rri->ri_CopyMultiInsertBuffer;
int nused = buffer->nused; int nused;
Assert(buffer != NULL); Assert(buffer != NULL);
Assert(nused < MAX_BUFFERED_TUPLES); Assert(buffer->nused < MAX_BUFFERED_TUPLES);
nused = buffer->nused;
if (buffer->slots[nused] == NULL) if (buffer->slots[nused] == NULL)
buffer->slots[nused] = table_slot_create(rri->ri_RelationDesc, NULL); buffer->slots[nused] = table_slot_create(rri->ri_RelationDesc, NULL);