summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2009-10-08 04:46:30 +0000
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2009-10-08 04:46:30 +0000
commit09a12ef929909851f31794dcd361e469ad467599 (patch)
treedb854d2fa02b603dcbf883803a4437ad3f1b46af
parent4c7ac1aea74fbb37f39cbb25e8fbfcd1966d6d0e (diff)
downloadpostgresql-09a12ef929909851f31794dcd361e469ad467599.tar.gz
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)
-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 f4fc67a843..a5aab28774 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.74 2009/06/11 14:49:03 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.74.2.1 2009/10/08 04:46:30 heikki Exp $
*
* Jon Postel RIP 16 Oct 1998
*/
@@ -972,7 +972,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];