summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2009-10-08 04:46:44 +0000
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2009-10-08 04:46:44 +0000
commitb357128a96ecd056381d1e0a54df2f9de5f8253b (patch)
treeac9c635f131695a8774322abfbeed71a2874c212 /src
parent9b5ac366f922cee5bbb73180fe400dffb5c13136 (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')
-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 bb9210e16d2..0580c474096 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.66.2.1 2007/05/17 23:31:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.66.2.2 2009/10/08 04:46:44 heikki Exp $
*
* Jon Postel RIP 16 Oct 1998
*/
@@ -1015,7 +1015,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];