aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-08-12 14:54:28 +0200
committerHarald Welte <laforge@gnumonks.org>2017-08-12 18:23:25 +0200
commiteca48374c0e4b6eccb3edd149f6e78fd5ad95bab (patch)
treec017fe7ed9a897147039cca70b74986935c94b20
parentfb845eff238db7b346ca84a3657f50011ca5d0ca (diff)
lib/in46_addr: Avoid ASSERT() when in46a_ntop() is called on uninitialized address
-rw-r--r--lib/in46_addr.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/in46_addr.c b/lib/in46_addr.c
index 6864c64..4b5fd64 100644
--- a/lib/in46_addr.c
+++ b/lib/in46_addr.c
@@ -62,7 +62,14 @@ int in46a_to_sas(struct sockaddr_storage *out, const struct in46_addr *in)
/*! Convenience wrapper around inet_ntop() for \ref in46_addr */
const char *in46a_ntop(const struct in46_addr *in, char *dst, socklen_t dst_size)
{
- int af = in46a_to_af(in);
+ int af;
+
+ if (!in || in->len == 0) {
+ strncpy(dst, "UNDEFINED", dst_size);
+ return dst;
+ }
+
+ af = in46a_to_af(in);
if (af < 0)
return NULL;