Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f0ff52f

Browse files
committed
Avoid memcpy() with a NULL source pointer and count == 0
When memcpy() is called on a pointer, the compiler is entitled to assume that the pointer is not null, which can lead to optimizing nearby code in potentially undesirable ways. We still want such optimizations (gcc's -fdelete-null-pointer-checks) in cases where they're valid. Related: commit 13bba02. Backpatch to pg11, where this particular instance appeared. Reported-by: Ranier Vilela <ranier.vf@gmail.com> Reported-by: Zhihong Yu <zyu@yugabyte.com> Discussion: https://postgr.es/m/CAEudQApUndmQkr5fLrCKXQ7+ib44i7S+Kk93pyVThS85PnG3bQ@mail.gmail.com Discussion: https://postgr.es/m/CALNJ-vSdhwSM5f4tnNn1cdLHvXMVe_S+V3nR5GwNrmCPNB2VtQ@mail.gmail.com
1 parent 50f3385 commit f0ff52f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/backend/commands/indexcmds.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,15 +1091,17 @@ DefineIndex(Oid relationId,
10911091

10921092
if (partitioned)
10931093
{
1094+
PartitionDesc partdesc;
1095+
10941096
/*
10951097
* Unless caller specified to skip this step (via ONLY), process each
10961098
* partition to make sure they all contain a corresponding index.
10971099
*
10981100
* If we're called internally (no stmt->relation), recurse always.
10991101
*/
1100-
if (!stmt->relation || stmt->relation->inh)
1102+
partdesc = RelationGetPartitionDesc(rel);
1103+
if ((!stmt->relation || stmt->relation->inh) && partdesc->nparts > 0)
11011104
{
1102-
PartitionDesc partdesc = RelationGetPartitionDesc(rel);
11031105
int nparts = partdesc->nparts;
11041106
Oid *part_oids = palloc(sizeof(Oid) * nparts);
11051107
bool invalidate_parent = false;

0 commit comments

Comments
 (0)