From 01a4b38fc8372a485bff4a5cb0ba82ca8f860aa2 Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Wed, 25 Apr 2018 02:43:01 +0200 Subject: [PATCH] uiplib: ensure string is null-terminated when printing unspecified address --- os/net/ipv6/uiplib.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/os/net/ipv6/uiplib.c b/os/net/ipv6/uiplib.c index 693626c87..afe6de42b 100644 --- a/os/net/ipv6/uiplib.c +++ b/os/net/ipv6/uiplib.c @@ -250,9 +250,11 @@ uiplib_ipaddr_snprint(char *buf, size_t size, const uip_ipaddr_t *addr) } } - if(n >= size - 1) { - buf[size - 1] = '\0'; - } + /* + * Make sure the output string is always null-terminated. + */ + buf[MIN(n, size - 1)] = '\0'; + return n; } /*---------------------------------------------------------------------------*/