mirror of
https://github.com/postgres/postgres.git
synced 2025-10-24 01:29:19 +03:00
Fix integer-overflow problem in intarray's g_int_decompress().
An array element equal to INT_MAX gave this code indigestion,
causing an infinite loop that surely ended in SIGSEGV. We fixed
some nearby problems awhile ago (cf 757c5182f) but missed this.
Report and diagnosis by Alexander Lakhin (bug #18273); patch by me
Discussion: https://postgr.es/m/18273-9a832d1da122600c@postgresql.org
This commit is contained in:
@@ -287,8 +287,7 @@ g_int_decompress(PG_FUNCTION_ARGS)
|
||||
ArrayType *in;
|
||||
int lenin;
|
||||
int *din;
|
||||
int i,
|
||||
j;
|
||||
int i;
|
||||
|
||||
in = DatumGetArrayTypeP(entry->key);
|
||||
|
||||
@@ -332,9 +331,12 @@ g_int_decompress(PG_FUNCTION_ARGS)
|
||||
dr = ARRPTR(r);
|
||||
|
||||
for (i = 0; i < lenin; i += 2)
|
||||
for (j = din[i]; j <= din[i + 1]; j++)
|
||||
{
|
||||
/* use int64 for j in case din[i + 1] is INT_MAX */
|
||||
for (int64 j = din[i]; j <= din[i + 1]; j++)
|
||||
if ((!i) || *(dr - 1) != j)
|
||||
*dr++ = j;
|
||||
*dr++ = (int) j;
|
||||
}
|
||||
|
||||
if (in != (ArrayType *) DatumGetPointer(entry->key))
|
||||
pfree(in);
|
||||
|
||||
Reference in New Issue
Block a user