From 6780cd23fb1b1d9d345e6ad570162217989553e8 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 12 Dec 2009 19:24:57 +0000 Subject: [PATCH] Fix integer-to-bit-string conversions to handle the first fractional byte correctly when the output bit width is wider than the given integer by something other than a multiple of 8 bits. This has been wrong since I first wrote that code for 8.0 :-(. Kudos to Roman Kononov for being the first to notice, though I didn't use his patch. Per bug #5237. --- src/backend/utils/adt/varbit.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index e89e2bf323..70353df566 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.50.2.1 2007/08/21 02:40:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.50.2.2 2009/12/12 19:24:57 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1261,7 +1261,12 @@ bitfromint4(PG_FUNCTION_ARGS) /* store first fractional byte */ if (destbitsleft > srcbitsleft) { - *r++ = (bits8) ((a >> (srcbitsleft - 8)) & BITMASK); + int val = (int) (a >> (destbitsleft - 8)); + + /* Force sign-fill in case the compiler implements >> as zero-fill */ + if (a < 0) + val |= (-1) << (srcbitsleft + 8 - destbitsleft); + *r++ = (bits8) (val & BITMASK); destbitsleft -= 8; } /* Now srcbitsleft and destbitsleft are the same, need not track both */ @@ -1340,7 +1345,12 @@ bitfromint8(PG_FUNCTION_ARGS) /* store first fractional byte */ if (destbitsleft > srcbitsleft) { - *r++ = (bits8) ((a >> (srcbitsleft - 8)) & BITMASK); + int val = (int) (a >> (destbitsleft - 8)); + + /* Force sign-fill in case the compiler implements >> as zero-fill */ + if (a < 0) + val |= (-1) << (srcbitsleft + 8 - destbitsleft); + *r++ = (bits8) (val & BITMASK); destbitsleft -= 8; } /* Now srcbitsleft and destbitsleft are the same, need not track both */