From 24236a6d288843a0504f5bdeffe0a8f033ef41b4 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 24 Nov 2014 08:17:45 +0000 Subject: [PATCH] - Fix log at high verbosity and memory allocation failure. git-svn-id: file:///svn/unbound/trunk@3278 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ util/data/msgreply.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 983c6d217..8d197755b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +24 November 2014: Wouter + - Fix log at high verbosity and memory allocation failure. + 21 November 2014: Wouter - Fix crash on multiple thread random usage on systems without arc4random. diff --git a/util/data/msgreply.c b/util/data/msgreply.c index 0d2565753..68bcfd09e 100644 --- a/util/data/msgreply.c +++ b/util/data/msgreply.c @@ -773,15 +773,14 @@ log_dns_msg(const char* str, struct query_info* qinfo, struct reply_info* rep) region, 65535, 1)) { log_info("%s: log_dns_msg: out of memory", str); } else { - char* str = sldns_wire2str_pkt(sldns_buffer_begin(buf), + char* s = sldns_wire2str_pkt(sldns_buffer_begin(buf), sldns_buffer_limit(buf)); - if(!str) { + if(!s) { log_info("%s: log_dns_msg: ldns tostr failed", str); } else { - log_info("%s %s", - str, (char*)sldns_buffer_begin(buf)); + log_info("%s %s", str, s); } - free(str); + free(s); } sldns_buffer_free(buf); regional_destroy(region); -- 2.47.2