- Fix log at high verbosity and memory allocation failure.

git-svn-id: file:///svn/unbound/trunk@3278 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 983c6d217f4cd289e97de81b07997fecb56402e4..8d197755b740215f5ee181950dacb4875546dc76 100644 (file)
--- 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 0d2565753baf90c547d3449b5f3f03d5f5a367c1..68bcfd09ee39423c10734ae24d1b1dfc93a03c28 100644 (file)
--- 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);