summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/network.c
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2009-10-08 04:46:37 +0000
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2009-10-08 04:46:37 +0000
commitc2c86e4881f7587a1424e48151a020989d0395d1 (patch)
treec9cdf13e45dd51edd5781e095c56d03eed863e02 /src/backend/utils/adt/network.c
parent895a3fb65812899b531191fd981acfd0fc551cfc (diff)
Fix off-by-one bug in bitncmp(): When comparing a number of bits divisible by
8, bitncmp() may dereference a pointer one byte out of bounds. Chris Mikkelson (bug #5101)
Diffstat (limited to 'src/backend/utils/adt/network.c')
-rw-r--r--src/backend/utils/adt/network.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 7eb6ffe306f..9a45bcbd290 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for the INET and CIDR types.
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.72 2007/11/15 21:14:39 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.72.2.1 2009/10/08 04:46:37 heikki Exp $
*
* Jon Postel RIP 16 Oct 1998
*/
@@ -994,7 +994,7 @@ bitncmp(void *l, void *r, int n)
b = n / 8;
x = memcmp(l, r, b);
- if (x)
+ if (x || (n % 8) == 0)
return x;
lb = ((const u_char *) l)[b];