diff --git a/CHANGES b/CHANGES
index 9333b4b1dc..4a3ff5fde5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1635.	[bug]		Memory leak on error in query_addds().
+
 1634.	[placeholder]	rt11208
 
 1633.	[bug]		named should return NOTIMP to update requests to a
diff --git a/bin/named/query.c b/bin/named/query.c
index 1ba7622df2..556c294646 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.258 2004/04/15 01:58:23 marka Exp $ */
+/* $Id: query.c,v 1.259 2004/05/14 00:10:52 marka Exp $ */
 
 #include <config.h>
 
@@ -1785,7 +1785,7 @@ query_addds(ns_client_t *client, dns_db_t *db, dns_dbnode_t *node) {
 	rdataset = query_newrdataset(client);
 	sigrdataset = query_newrdataset(client);
 	if (rdataset == NULL || sigrdataset == NULL)
-		return;
+		goto cleanup;
 
 	/*
 	 * Look for the DS record, which may or may not be present.