From 03c4ee417a446587ee78a53844a76d202a3586de Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 18 Jul 2012 09:43:50 +0000
Subject: [PATCH] 	- Fix libunbound report of errors when in background
 mode.

git-svn-id: file:///svn/unbound/trunk@2716 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog          | 3 +++
 libunbound/libworker.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 59d6f2bfa..c6672c4c6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+18 July 2012: Willem
+	- Fix libunbound report of errors when in background mode.
+
 11 July 2012: Willem
 	- updated iana ports list.
 
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 917a9106d..b23d560ab 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -643,6 +643,8 @@ libworker_bg_done_cb(void* arg, int rcode, ldns_buffer* buf, enum sec_status s,
 		return;
 	}
 	q->msg_security = s;
+	if(!buf)
+		buf = q->w->env->scratch_buffer;
 	if(rcode != 0) {
 		error_encode(buf, rcode, NULL, 0, BIT_RD, NULL);
 	}