From c1aec1cfa0d5fa64dff2d177800797d7e3d8c15c Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 8 Aug 2016 13:52:54 +0100 Subject: fix urldb warning and test build --- content/urldb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'content') diff --git a/content/urldb.c b/content/urldb.c index add0e4bae..35254921a 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -1346,7 +1346,8 @@ static void urldb_dump_search(struct search_node *parent, int depth) int i; /* index into string */ char s[1024]; int r; - + int sl = sizeof(s) - 2; + if (parent == &empty) return; @@ -1358,8 +1359,8 @@ static void urldb_dump_search(struct search_node *parent, int depth) for (h = parent->data; h; h = h->parent) { if (h->part) { - r = snprintf(&s[i], (sizeof(s) - 2) - i, "%s", h->part); - if ((i + r) > (sizeof(s) - 2)) { + r = snprintf(&s[i], sl - i, "%s", h->part); + if ((i + r) > sl) { break; } i += r; -- cgit v1.2.3