summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/network.c
diff options
context:
space:
mode:
authorHeikki Linnakangas2009-10-08 04:46:21 +0000
committerHeikki Linnakangas2009-10-08 04:46:21 +0000
commiteab94d8182691aa64126736c546d7c5215187d79 (patch)
treea0563a92938d29ea81d8aa5ea81180f540346943 /src/backend/utils/adt/network.c
parent822b0159cc4a4411bb8d2829f7328b7c52fef2f2 (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 f4fc67a8439..0ea13fc47bd 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.75 2009/10/08 04:46:21 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];