From 53d52a685a905dfffd72d07d4e0d6cb925b7ce3b Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 22 Mar 1999 05:00:57 +0000 Subject: [PATCH] Cleanup of NULL in inet types. --- src/backend/utils/adt/mac.c | 24 +++++--- src/backend/utils/adt/network.c | 128 ++++++++++++++++++++-------------------- 2 files changed, 81 insertions(+), 71 deletions(-) diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index c4a43f39dc..957292af8e 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.c,v 1.6 1998/10/26 01:01:36 tgl Exp $ + * $Id: mac.c,v 1.7 1999/03/22 05:00:57 momjian Exp $ */ #include @@ -156,7 +156,6 @@ macaddr_in(char *str) if (strlen(str) > 0) { - count = sscanf(str, "%x:%x:%x:%x:%x:%x", &a, &b, &c, &d, &e, &f); if (count != 6) count = sscanf(str, "%x-%x-%x-%x-%x-%x", &a, &b, &c, &d, &e, &f); @@ -168,18 +167,12 @@ macaddr_in(char *str) count = sscanf(str, "%2x%2x.%2x%2x.%2x%2x", &a, &b, &c, &d, &e, &f); if (count != 6) - { elog(ERROR, "macaddr_in: error in parsing \"%s\"", str); - return (NULL); - } if ((a < 0) || (a > 255) || (b < 0) || (b > 255) || (c < 0) || (c > 255) || (d < 0) || (d > 255) || (e < 0) || (e > 255) || (f < 0) || (f > 255)) - { elog(ERROR, "macaddr_in: illegal address \"%s\"", str); - return (NULL); - } } else { @@ -232,6 +225,8 @@ macaddr_out(macaddr *addr) bool macaddr_lt(macaddr *a1, macaddr *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return ((hibits(a1) < hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) < lobits(a2))); } @@ -239,6 +234,8 @@ macaddr_lt(macaddr *a1, macaddr *a2) bool macaddr_le(macaddr *a1, macaddr *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return ((hibits(a1) < hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) <= lobits(a2))); } @@ -246,12 +243,16 @@ macaddr_le(macaddr *a1, macaddr *a2) bool macaddr_eq(macaddr *a1, macaddr *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return ((hibits(a1) == hibits(a2)) && (lobits(a1) == lobits(a2))); } bool macaddr_ge(macaddr *a1, macaddr *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return ((hibits(a1) > hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) >= lobits(a2))); } @@ -259,6 +260,8 @@ macaddr_ge(macaddr *a1, macaddr *a2) bool macaddr_gt(macaddr *a1, macaddr *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return ((hibits(a1) > hibits(a2)) || ((hibits(a1) == hibits(a2)) && lobits(a1) > lobits(a2))); } @@ -266,6 +269,8 @@ macaddr_gt(macaddr *a1, macaddr *a2) bool macaddr_ne(macaddr *a1, macaddr *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return ((hibits(a1) != hibits(a2)) || (lobits(a1) != lobits(a2))); } @@ -299,6 +304,9 @@ macaddr_manuf(macaddr *addr) int length; text *result; + if (!PointerIsValid(addr)) + return NULL; + for (manuf = manufacturers; manuf->name != NULL; manuf++) { if ((manuf->a == addr->a) && diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index fbe087f7b3..5c0e4a18f6 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -3,7 +3,7 @@ * is for IP V4 CIDR notation, but prepared for V6: just * add the necessary bits where the comments indicate. * - * $Id: network.c,v 1.6 1999/02/24 03:17:05 momjian Exp $ + * $Id: network.c,v 1.7 1999/03/22 05:00:57 momjian Exp $ * Jon Postel RIP 16 Oct 1998 */ @@ -50,23 +50,21 @@ network_in(char *src, int type) int bits; inet *dst; + if (!src) + return NULL; + dst = palloc(VARHDRSZ + sizeof(inet_struct)); if (dst == NULL) - { elog(ERROR, "unable to allocate memory in network_in()"); - return NULL; - } + /* First, try for an IP V4 address: */ ip_family(dst) = AF_INET; bits = inet_net_pton(ip_family(dst), src, &ip_v4addr(dst), type ? ip_addrsize(dst) : -1); if ((bits < 0) || (bits > 32)) - { /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "could not parse \"%s\"", src); - pfree(dst); - return NULL; - } + VARSIZE(dst) = VARHDRSZ + ((char *) &ip_v4addr(dst) - (char *) VARDATA(dst)) + ip_addrsize(dst); @@ -110,23 +108,16 @@ inet_out(inet *src) tmp, sizeof(tmp)); if (dst == NULL) - { elog(ERROR, "unable to print address (%s)", strerror(errno)); - return (NULL); - } } else - { /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "unknown address family (%d)", ip_family(src)); - return NULL; - } + dst = palloc(strlen(tmp) + 1); if (dst == NULL) - { elog(ERROR, "unable to allocate memory in inet_out()"); - return NULL; - } + strcpy(dst, tmp); return dst; } @@ -146,6 +137,8 @@ cidr_out(inet *src) bool network_lt(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { int order = v4bitncmp(ip_v4addr(a1), ip_v4addr(a2), ip_bits(a2)); @@ -157,19 +150,23 @@ network_lt(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } bool network_le(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return (network_lt(a1, a2) || network_eq(a1, a2)); } bool network_eq(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { return ((ip_bits(a1) == ip_bits(a2)) @@ -180,19 +177,23 @@ network_eq(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } bool network_ge(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return (network_gt(a1, a2) || network_eq(a1, a2)); } bool network_gt(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { int order = v4bitncmp(ip_v4addr(a1), ip_v4addr(a2), ip_bits(a2)); @@ -204,19 +205,24 @@ network_gt(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } bool network_ne(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return FALSE; return (!network_eq(a1, a2)); } bool network_sub(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return NULL; + if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { return ((ip_bits(a1) > ip_bits(a2)) @@ -227,13 +233,16 @@ network_sub(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } bool network_subeq(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return NULL; + if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { return ((ip_bits(a1) >= ip_bits(a2)) @@ -244,13 +253,16 @@ network_subeq(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } bool network_sup(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return NULL; + if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { return ((ip_bits(a1) < ip_bits(a2)) @@ -261,13 +273,16 @@ network_sup(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } bool network_supeq(inet *a1, inet *a2) { + if (!PointerIsValid(a1) || !PointerIsValid(a2)) + return NULL; + if ((ip_family(a1) == AF_INET) && (ip_family(a2) == AF_INET)) { return ((ip_bits(a1) <= ip_bits(a2)) @@ -278,7 +293,7 @@ network_supeq(inet *a1, inet *a2) /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "cannot compare address families %d and %d", ip_family(a1), ip_family(a2)); - return (FALSE); + return FALSE; } } @@ -304,36 +319,29 @@ network_host(inet *ip) char *ptr, tmp[sizeof("255.255.255.255/32")]; + if (!PointerIsValid(ip)) + return NULL; + if (ip_type(ip)) - { elog(ERROR, "CIDR type has no host part"); - return NULL; - } if (ip_family(ip) == AF_INET) { /* It's an IP V4 address: */ if (inet_net_ntop(AF_INET, &ip_v4addr(ip), 32, tmp, sizeof(tmp)) == NULL) - { elog(ERROR, "unable to print host (%s)", strerror(errno)); - return (NULL); - } } else - { /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "unknown address family (%d)", ip_family(ip)); - return (NULL); - } + if ((ptr = strchr(tmp, '/')) != NULL) *ptr = 0; len = VARHDRSZ + strlen(tmp) + 1; ret = palloc(len); if (ret == NULL) - { elog(ERROR, "unable to allocate memory in network_host()"); - return (NULL); - } + VARSIZE(ret) = len; strcpy(VARDATA(ret), tmp); return (ret); @@ -342,6 +350,9 @@ network_host(inet *ip) int4 network_masklen(inet *ip) { + if (!PointerIsValid(ip)) + return 0; + return ip_bits(ip); } @@ -353,6 +364,9 @@ network_broadcast(inet *ip) char *ptr, tmp[sizeof("255.255.255.255/32")]; + if (!PointerIsValid(ip)) + return NULL; + if (ip_family(ip) == AF_INET) { /* It's an IP V4 address: */ @@ -364,26 +378,20 @@ network_broadcast(inet *ip) addr = htonl(ntohl(ip_v4addr(ip)) | mask); if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) == NULL) - { elog(ERROR, "unable to print address (%s)", strerror(errno)); - return (NULL); - } + } else - { /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "unknown address family (%d)", ip_family(ip)); - return (NULL); - } + if ((ptr = strchr(tmp, '/')) != NULL) *ptr = 0; len = VARHDRSZ + strlen(tmp) + 1; ret = palloc(len); if (ret == NULL) - { elog(ERROR, "unable to allocate memory in network_broadcast()"); - return (NULL); - } + VARSIZE(ret) = len; strcpy(VARDATA(ret), tmp); return (ret); @@ -396,30 +404,27 @@ network_network(inet *ip) int len; char tmp[sizeof("255.255.255.255/32")]; + if (!PointerIsValid(ip)) + return NULL; + if (ip_family(ip) == AF_INET) { /* It's an IP V4 address: */ int addr = htonl(ntohl(ip_v4addr(ip)) & (0xffffffff << (32 - ip_bits(ip)))); if (inet_cidr_ntop(AF_INET, &addr, ip_bits(ip), tmp, sizeof(tmp)) == NULL) - { elog(ERROR, "unable to print network (%s)", strerror(errno)); - return (NULL); - } + } else - { /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "unknown address family (%d)", ip_family(ip)); - return (NULL); - } + len = VARHDRSZ + strlen(tmp) + 1; ret = palloc(len); if (ret == NULL) - { elog(ERROR, "unable to allocate memory in network_network()"); - return (NULL); - } + VARSIZE(ret) = len; strcpy(VARDATA(ret), tmp); return (ret); @@ -433,32 +438,29 @@ network_netmask(inet *ip) char *ptr, tmp[sizeof("255.255.255.255/32")]; + if (!PointerIsValid(ip)) + return NULL; + if (ip_family(ip) == AF_INET) { /* It's an IP V4 address: */ int addr = htonl((-1 << (32 - ip_bits(ip))) & 0xffffffff); if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) == NULL) - { elog(ERROR, "unable to print netmask (%s)", strerror(errno)); - return (NULL); - } + } else - { /* Go for an IPV6 address here, before faulting out: */ elog(ERROR, "unknown address family (%d)", ip_family(ip)); - return (NULL); - } + if ((ptr = strchr(tmp, '/')) != NULL) *ptr = 0; len = VARHDRSZ + strlen(tmp) + 1; ret = palloc(len); if (ret == NULL) - { elog(ERROR, "unable to allocate memory in network_netmask()"); - return (NULL); - } + VARSIZE(ret) = len; strcpy(VARDATA(ret), tmp); return (ret); -- 2.11.0