From 33520b43ec662e9544e64f794261976bd517fa23 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 12 Aug 2017 14:54:28 +0200 Subject: lib/in46_addr: Avoid ASSERT() when in46a_ntop() is called on uninitialized address Change-Id: I42d41ec1370b9cc15d372b649d8e1bc78e76af9b --- lib/in46_addr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3