postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-16 02:23:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure qsort comparison function is transitive

Browse Source 
If the comparison function for qsort is non-transitive, there is a risk
of out-of-bounds access. Subtraction of integers can lead to overflows,
so instead use a real comparison function.
This commit is contained in:
Mats Kindahl 2024-02-06 12:13:33 +01:00 committed by Mats Kindahl
parent 6c0009af48
commit 9e67552c7d
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.unreleased/fix_6610 Normal file
View File

@ -0,0 +1 @@
Fixes: #6610 Ensure qsort comparison function is transitive

9
src/planner/expand_hypertable.c
View File

@ -858,7 +858,14 @@ collect_quals_walker(Node *node, CollectQualCtx *ctx)
static int
chunk_cmp_chunk_reloid(const void *c1, const void *c2)
{
return (*(Chunk **) c1)->table_id - (*(Chunk **) c2)->table_id;
Oid lhs = (*(Chunk **) c1)->table_id;
Oid rhs = (*(Chunk **) c2)->table_id;
if (lhs < rhs)
return -1;
if (lhs > rhs)
return 1;
return 0;
}
static Chunk **

10
src/process_utility.c
View File

@ -2819,10 +2819,14 @@ process_index_start(ProcessUtilityArgs *args)
static int
chunk_index_mappings_cmp(const void *p1, const void *p2)
{
const ChunkIndexMapping *mapping[] = { *((ChunkIndexMapping *const *) p1),
*((ChunkIndexMapping *const *) p2) };
const ChunkIndexMapping *lhs = *((ChunkIndexMapping *const *) p1);
const ChunkIndexMapping *rhs = *((ChunkIndexMapping *const *) p2);
return mapping[0]->chunkoid - mapping[1]->chunkoid;
if (lhs->chunkoid < rhs->chunkoid)
return -1;
if (lhs->chunkoid > rhs->chunkoid)
return 1;
return 0;
}
/*