aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2016-06-16 17:16:32 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2016-06-16 17:16:40 -0400
commita41b14f94a44c1738356719f46b330372228ee4e (patch)
treeba3fc65e05445c0dbd2be9c140cfd84e13e26b7e
parent4f5995dd983db31bce347411c16ecc7319a2d9af (diff)
downloadpostgresql-a41b14f94a44c1738356719f46b330372228ee4e.tar.gz
postgresql-a41b14f94a44c1738356719f46b330372228ee4e.zip
Fix validation of overly-long IPv6 addresses.
The inet/cidr types sometimes failed to reject IPv6 inputs with too many colon-separated fields, instead translating them to '::/0'. This is the result of a thinko in the original ISC code that seems to be as yet unreported elsewhere. Per bug #14198 from Stefan Kaltenbrunner. Report: <20160616182222.5798.959@wrigleys.postgresql.org>
-rw-r--r--src/backend/utils/adt/inet_net_pton.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index 9064eaf64b0..b8fa7d2bccf 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -496,7 +496,7 @@ inet_cidr_pton_ipv6(const char *src, u_char *dst, size_t size)
else if (*src == '\0')
goto enoent;
if (tp + NS_INT16SZ > endp)
- return (0);
+ goto enoent;
*tp++ = (u_char) (val >> 8) & 0xff;
*tp++ = (u_char) val & 0xff;
saw_xdigit = 0;